Received: by 2002:a5b:505:0:0:0:0:0 with SMTP id o5csp745312ybp; Fri, 11 Oct 2019 03:46:49 -0700 (PDT) X-Google-Smtp-Source: APXvYqwJlITvpa6fC81vEy+NXr/m3n8a8o4040imlUE8YwZd9PdtwgGSWgsFhe7vGnYwH0+R9I/H X-Received: by 2002:a17:906:6ad7:: with SMTP id q23mr12642929ejs.214.1570790809236; Fri, 11 Oct 2019 03:46:49 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1570790809; cv=none; d=google.com; s=arc-20160816; b=rw06pwXuq7jVMLuQ8H+p0obdW253xMREs6S3l1fMm6l6eSCK8jAUXoOBVV6pvCl7nk teR4lQYjdqVIldjHNo0U/zr2b6nhdby2QbqhBWHgns2H6hJvRwFU0rJnel43kR1Ze0Lo rx8EvXR5BCV4fwQZRKxcxHx1wb7XfSNs9/ldcL8yOQxpS9/dqorXoK1T91ym4irdIFVn nTQH5jB2VbOwz3ZIbHLofv8bWOJ2fwVFq0zEvB/7sh624I2TmF4TPlt4TbgMQdD04Umc dXweinbaN9zkNZy2OsS+I79lvu1E3OHh5d46lvmb43vhLc6rOggLm5HIRnFTuoDSBlLd zejQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:subject:cc:to:from:date :dkim-signature; bh=K5ERSZk8gSuRPFS86h8zzN8u9sVtC2cNRVgrBQVPbgk=; b=bPTPETyByhJcqk5wo8A97s07kMDruNEGVRYD9TWZmY0/EYiI3CMgJhMExbiUBXp002 7ecpYFJD2/09UMIR8vjgTqiGnN60kfkhhKdp0+YOK6nCaEs7S1j3HjVIEuFXcW/bAFXE 1JdGFiBDoGO/g2bDILbw5NNFdoKNYnWJV1v50zQRTDa/BkTjOLtrL6BG+pRLMZuObkyw Qd/hTjti0Xas4yJXW4ViWBx/x/dOh/K+TFUxMQpsWocbrza6D+C0FKJ6pt1KQpDbpRaj 0r5yBCHheSBe85DUvTpQXzP3nVWSRG0SzovtmOBD9CEHcX3Lk52FA7iPSv+aBh2Qit1z iliA== ARC-Authentication-Results: i=1; mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b="p/ZNMwlO"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f15si5025709edm.414.2019.10.11.03.46.25; Fri, 11 Oct 2019 03:46:49 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=fail header.i=@infradead.org header.s=bombadil.20170209 header.b="p/ZNMwlO"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727589AbfJKKnw (ORCPT + 99 others); Fri, 11 Oct 2019 06:43:52 -0400 Received: from bombadil.infradead.org ([198.137.202.133]:56400 "EHLO bombadil.infradead.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726710AbfJKKnv (ORCPT ); Fri, 11 Oct 2019 06:43:51 -0400 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=infradead.org; s=bombadil.20170209; h=Content-Transfer-Encoding: Content-Type:MIME-Version:References:In-Reply-To:Message-ID:Subject:Cc:To: From:Date:Sender:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Id: List-Help:List-Unsubscribe:List-Subscribe:List-Post:List-Owner:List-Archive; bh=K5ERSZk8gSuRPFS86h8zzN8u9sVtC2cNRVgrBQVPbgk=; b=p/ZNMwlOjTtB0RtzM0DwtwE0O 8Bkx57DSxOQSB6E9AJhpOfCOByWELpYlQ71oTWpyaFJmWIS8NJL7M3hm8O54NrOU0Q492KQfgcwSB QwiDkBzUXylfd6hh1IpWN5tyebh7Nu+Wx6VdxrF+g6Qq8O3KtH9ONYDdZr72aqQbuovu229O2nL8z AH5l+QhdF102tFjM4aBhMrp7xFvuUvL/1vdFzGd7MoXbTOTnfIeceSOA+swtqpQ4szD1gVgVxzAn1 B2s0auQvET+hiM2aIe8YYsMz8fpexXOzoK4hEGfu+WlFaMnW4j1LJYDOpYm9ZPHEmPPLJZ+yASFhn OSpdtc5QA==; Received: from 177.17.141.107.dynamic.adsl.gvt.net.br ([177.17.141.107] helo=coco.lan) by bombadil.infradead.org with esmtpsa (Exim 4.92.3 #3 (Red Hat Linux)) id 1iIsOg-00076f-Tm; Fri, 11 Oct 2019 10:43:47 +0000 Date: Fri, 11 Oct 2019 07:43:42 -0300 From: Mauro Carvalho Chehab To: Robert Richter Cc: Borislav Petkov , Tony Luck , James Morse , "linux-edac@vger.kernel.org" , "linux-kernel@vger.kernel.org" Subject: Re: [PATCH 08/19] EDAC, mc: Split edac_mc_alloc() into smaller functions Message-ID: <20191011074342.71e443a9@coco.lan> In-Reply-To: <20191010202418.25098-9-rrichter@marvell.com> References: <20191010202418.25098-1-rrichter@marvell.com> <20191010202418.25098-9-rrichter@marvell.com> X-Mailer: Claws Mail 3.17.4 (GTK+ 2.24.32; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Em Thu, 10 Oct 2019 20:25:20 +0000 Robert Richter escreveu: > edac_mc_alloc() is huge. Factor out code by moving it to the two new > functions edac_mc_alloc_csrows() and edac_mc_alloc_dimms(). Do not > move code yet for better review. > > Signed-off-by: Robert Richter Reviewed-by: Mauro Carvalho Chehab > --- > drivers/edac/edac_mc.c | 104 +++++++++++++++++++++++++++-------------- > 1 file changed, 69 insertions(+), 35 deletions(-) > > diff --git a/drivers/edac/edac_mc.c b/drivers/edac/edac_mc.c > index a893f793be8a..0db504cb3419 100644 > --- a/drivers/edac/edac_mc.c > +++ b/drivers/edac/edac_mc.c > @@ -305,6 +305,9 @@ static void _edac_mc_free(struct mem_ctl_info *mci) > kfree(mci); > } > > +static int edac_mc_alloc_csrows(struct mem_ctl_info *mci); > +static int edac_mc_alloc_dimms(struct mem_ctl_info *mci); > + > struct mem_ctl_info *edac_mc_alloc(unsigned int mc_num, > unsigned int n_layers, > struct edac_mc_layer *layers, > @@ -312,14 +315,9 @@ struct mem_ctl_info *edac_mc_alloc(unsigned int mc_num, > { > struct mem_ctl_info *mci; > struct edac_mc_layer *layer; > - struct csrow_info *csr; > - struct rank_info *chan; > - struct dimm_info *dimm; > - unsigned int pos[EDAC_MAX_LAYERS]; > unsigned int idx, size, tot_dimms = 1; > unsigned int tot_csrows = 1, tot_channels = 1; > - void *pvt, *p, *ptr = NULL; > - int j, row, chn, n, len; > + void *pvt, *ptr = NULL; > bool per_rank = false; > > if (WARN_ON(n_layers > EDAC_MAX_LAYERS || n_layers == 0)) > @@ -377,16 +375,43 @@ struct mem_ctl_info *edac_mc_alloc(unsigned int mc_num, > mci->num_cschannel = tot_channels; > mci->csbased = per_rank; > > + if (edac_mc_alloc_csrows(mci)) > + goto error; > + > + if (edac_mc_alloc_dimms(mci)) > + goto error; > + > + mci->op_state = OP_ALLOC; > + > + return mci; > + > +error: > + _edac_mc_free(mci); > + > + return NULL; > +} > +EXPORT_SYMBOL_GPL(edac_mc_alloc); > + > +static int edac_mc_alloc_csrows(struct mem_ctl_info *mci) > +{ > + unsigned int tot_csrows = mci->nr_csrows; > + unsigned int tot_channels = mci->num_cschannel; > + unsigned int row, chn; > + > /* > * Alocate and fill the csrow/channels structs > */ > mci->csrows = kcalloc(tot_csrows, sizeof(*mci->csrows), GFP_KERNEL); > if (!mci->csrows) > - goto error; > + return -ENOMEM; > + > for (row = 0; row < tot_csrows; row++) { > + struct csrow_info *csr; > + > csr = kzalloc(sizeof(**mci->csrows), GFP_KERNEL); > if (!csr) > - goto error; > + return -ENOMEM; > + > mci->csrows[row] = csr; > csr->csrow_idx = row; > csr->mci = mci; > @@ -394,34 +419,51 @@ struct mem_ctl_info *edac_mc_alloc(unsigned int mc_num, > csr->channels = kcalloc(tot_channels, sizeof(*csr->channels), > GFP_KERNEL); > if (!csr->channels) > - goto error; > + return -ENOMEM; > > for (chn = 0; chn < tot_channels; chn++) { > + struct rank_info *chan; > + > chan = kzalloc(sizeof(**csr->channels), GFP_KERNEL); > if (!chan) > - goto error; > + return -ENOMEM; > + > csr->channels[chn] = chan; > chan->chan_idx = chn; > chan->csrow = csr; > } > } > > + return 0; > +} > + > +static int edac_mc_alloc_dimms(struct mem_ctl_info *mci) > +{ > + void *p; > + unsigned int pos[EDAC_MAX_LAYERS]; > + unsigned int row, chn, idx; > + int layer; > + > /* > * Allocate and fill the dimm structs > */ > - mci->dimms = kcalloc(tot_dimms, sizeof(*mci->dimms), GFP_KERNEL); > + mci->dimms = kcalloc(mci->tot_dimms, sizeof(*mci->dimms), GFP_KERNEL); > if (!mci->dimms) > - goto error; > + return -ENOMEM; > > memset(&pos, 0, sizeof(pos)); > row = 0; > chn = 0; > - for (idx = 0; idx < tot_dimms; idx++) { > + for (idx = 0; idx < mci->tot_dimms; idx++) { > + struct dimm_info *dimm; > + struct rank_info *chan; > + int n, len; > + > chan = mci->csrows[row]->channels[chn]; > > dimm = kzalloc(sizeof(**mci->dimms), GFP_KERNEL); > if (!dimm) > - goto error; > + return -ENOMEM; > mci->dimms[idx] = dimm; > dimm->mci = mci; > dimm->idx = idx; > @@ -431,16 +473,16 @@ struct mem_ctl_info *edac_mc_alloc(unsigned int mc_num, > */ > len = sizeof(dimm->label); > p = dimm->label; > - n = snprintf(p, len, "mc#%u", mc_num); > + n = snprintf(p, len, "mc#%u", mci->mc_idx); > p += n; > len -= n; > - for (j = 0; j < n_layers; j++) { > + for (layer = 0; layer < mci->n_layers; layer++) { > n = snprintf(p, len, "%s#%u", > - edac_layer_name[layers[j].type], > - pos[j]); > + edac_layer_name[mci->layers[layer].type], > + pos[layer]); > p += n; > len -= n; > - dimm->location[j] = pos[j]; > + dimm->location[layer] = pos[layer]; > > if (len <= 0) > break; > @@ -452,39 +494,31 @@ struct mem_ctl_info *edac_mc_alloc(unsigned int mc_num, > dimm->cschannel = chn; > > /* Increment csrow location */ > - if (layers[0].is_virt_csrow) { > + if (mci->layers[0].is_virt_csrow) { > chn++; > - if (chn == tot_channels) { > + if (chn == mci->num_cschannel) { > chn = 0; > row++; > } > } else { > row++; > - if (row == tot_csrows) { > + if (row == mci->nr_csrows) { > row = 0; > chn++; > } > } > > /* Increment dimm location */ > - for (j = n_layers - 1; j >= 0; j--) { > - pos[j]++; > - if (pos[j] < layers[j].size) > + for (layer = mci->n_layers - 1; layer >= 0; layer--) { > + pos[layer]++; > + if (pos[layer] < mci->layers[layer].size) > break; > - pos[j] = 0; > + pos[layer] = 0; > } > } > > - mci->op_state = OP_ALLOC; > - > - return mci; > - > -error: > - _edac_mc_free(mci); > - > - return NULL; > + return 0; > } > -EXPORT_SYMBOL_GPL(edac_mc_alloc); > > void edac_mc_free(struct mem_ctl_info *mci) > { Thanks, Mauro