From mboxrd@z Thu Jan 1 00:00:00 1970 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: base64 Subject: [v3] EDAC, sb_edac: Remove VLA usage From: Borislav Petkov Message-Id: <20180314180305.GI16605@pd.tnic> Date: Wed, 14 Mar 2018 19:03:06 +0100 To: "Gustavo A. R. Silva" Cc: Mauro Carvalho Chehab , linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org List-ID: T24gVHVlLCBNYXIgMTMsIDIwMTggYXQgMDg6NDQ6NDlBTSAtMDUwMCwgR3VzdGF2byBBLiBSLiBT aWx2YSB3cm90ZToKPiBJbiBwcmVwYXJhdGlvbiB0byBlbmFibGluZyAtV3ZsYSwgcmVtb3ZlIFZM QSBhbmQgcmVwbGFjZSBpdAo+IHdpdGggYSBmaXhlZC1sZW5ndGggYXJyYXkgaW5zdGVhZC4KPiAK PiBGaXhlZCBhcyBwYXJ0IG9mIHRoZSBkaXJlY3RpdmUgdG8gcmVtb3ZlIGFsbCBWTEFzIGZyb20K PiB0aGUga2VybmVsOiBodHRwczovL2xrbWwub3JnL2xrbWwvMjAxOC8zLzcvNjIxCj4gCj4gUmV2 aWV3ZWQtYnk6IE1hdXJvIENhcnZhbGhvIENoZWhhYiA8bWNoZWhhYkBzLW9wZW5zb3VyY2UuY29t Pgo+IFNpZ25lZC1vZmYtYnk6IEd1c3Rhdm8gQS4gUi4gU2lsdmEgPGd1c3Rhdm9AZW1iZWRkZWRv ci5jb20+Cj4gLS0tCj4gQ2hhbmdlcyBpbiB2MzoKPiAgLSBVcGRhdGUgbWFjcm8gTUFYX0lOVEVS TEVBVkUgaW4gb3JkZXIgdG8gYXZvaWQgdG9vIGxvbmcgbGluZXMuCj4gICAgVGhpcyBjaGFuZ2Ug aXMgYmFzZWQgb24gTWF1cm8ncyBmZWVkYmFjay4KPiAgLSBVcGRhdGUgY2hhbmdlbG9nIHdpdGgg TWF1cm8ncyBSZXZpZXdlZC1ieS4KPiAKPiBDaGFuZ2VzIGluIHYyOgo+ICAtIFVzZSBtYWNybyBt YXhfdCB0byBjb21wdXRlIHRoZSBtYXggb2YgYWxsIHRocmVlIGFycmF5IHNpemVzLgo+ICAgIFRo aXMgY2hhbmdlIGlzIGJhc2VkIG9uIEJvcmlzbGF2J3MgZmVlZGJhY2suCj4gCj4gIGRyaXZlcnMv ZWRhYy9zYl9lZGFjLmMgfCA3ICsrKysrKy0KPiAgMSBmaWxlIGNoYW5nZWQsIDYgaW5zZXJ0aW9u cygrKSwgMSBkZWxldGlvbigtKQo+IAo+IGRpZmYgLS1naXQgYS9kcml2ZXJzL2VkYWMvc2JfZWRh Yy5jIGIvZHJpdmVycy9lZGFjL3NiX2VkYWMuYwo+IGluZGV4IDg3MjEwMDIuLmFmZjQ3NzggMTAw NjQ0Cj4gLS0tIGEvZHJpdmVycy9lZGFjL3NiX2VkYWMuYwo+ICsrKyBiL2RyaXZlcnMvZWRhYy9z Yl9lZGFjLmMKPiBAQCAtMTEwLDYgKzExMCwxMSBAQCBzdGF0aWMgY29uc3QgdTMyIGtubF9pbnRl cmxlYXZlX2xpc3RbXSA9IHsKPiAgCTB4ZGMsIDB4ZTQsIDB4ZWMsIDB4ZjQsIDB4ZmMsIC8qIDE1 LTE5ICovCj4gIAkweDEwNCwgMHgxMGMsIDB4MTE0LCAweDExYywgICAvKiAyMC0yMyAqLwo+ICB9 Owo+ICsjZGVmaW5lIE1BWF9JTlRFUkxFQVZFCQkJCQkJCVwKPiArCShtYXhfdCh1bnNpZ25lZCBp bnQsIEFSUkFZX1NJWkUoc2JyaWRnZV9pbnRlcmxlYXZlX2xpc3QpLAlcCj4gKwkgICAgICAgbWF4 X3QodW5zaWduZWQgaW50LCBBUlJBWV9TSVpFKGlicmlkZ2VfaW50ZXJsZWF2ZV9saXN0KSwJXAo+ ICsJCSAgICAgQVJSQVlfU0laRShrbmxfaW50ZXJsZWF2ZV9saXN0KSkpKQo+ICsKPiAgCj4gIHN0 cnVjdCBpbnRlcmxlYXZlX3BrZyB7Cj4gIAl1bnNpZ25lZCBjaGFyIHN0YXJ0Owo+IEBAIC0xODk5 LDcgKzE5MDQsNyBAQCBzdGF0aWMgaW50IGdldF9tZW1vcnlfZXJyb3JfZGF0YShzdHJ1Y3QgbWVt X2N0bF9pbmZvICptY2ksCj4gIAlpbnQJCQluX3Jpciwgbl9zYWRzLCBuX3RhZHMsIHNhZF93YXks IHNja194Y2g7Cj4gIAlpbnQJCQlzYWRfaW50ZXJsLCBpZHgsIGJhc2VfY2g7Cj4gIAlpbnQJCQlp bnRlcmxlYXZlX21vZGUsIHNoaWZ0dXAgPSAwOwo+IC0JdW5zaWduZWQJCXNhZF9pbnRlcmxlYXZl W3B2dC0+aW5mby5tYXhfaW50ZXJsZWF2ZV07CgpXaGVyZSdzIHRoZSBodW5rIHJlbW92aW5nIC0+ bWF4X2ludGVybGVhdmUgPwo= From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751988AbeCNSDo (ORCPT ); Wed, 14 Mar 2018 14:03:44 -0400 Received: from mail.skyhub.de ([5.9.137.197]:37264 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750950AbeCNSDm (ORCPT ); Wed, 14 Mar 2018 14:03:42 -0400 Date: Wed, 14 Mar 2018 19:03:06 +0100 From: Borislav Petkov To: "Gustavo A. R. Silva" Cc: Mauro Carvalho Chehab , linux-edac@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [PATCH v3] EDAC, sb_edac: Remove VLA usage Message-ID: <20180314180305.GI16605@pd.tnic> References: <20180313134449.GA24398@embeddedgus> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <20180313134449.GA24398@embeddedgus> User-Agent: Mutt/1.9.3 (2018-01-21) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Tue, Mar 13, 2018 at 08:44:49AM -0500, Gustavo A. R. Silva wrote: > In preparation to enabling -Wvla, remove VLA and replace it > with a fixed-length array instead. > > Fixed as part of the directive to remove all VLAs from > the kernel: https://lkml.org/lkml/2018/3/7/621 > > Reviewed-by: Mauro Carvalho Chehab > Signed-off-by: Gustavo A. R. Silva > --- > Changes in v3: > - Update macro MAX_INTERLEAVE in order to avoid too long lines. > This change is based on Mauro's feedback. > - Update changelog with Mauro's Reviewed-by. > > Changes in v2: > - Use macro max_t to compute the max of all three array sizes. > This change is based on Borislav's feedback. > > drivers/edac/sb_edac.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/drivers/edac/sb_edac.c b/drivers/edac/sb_edac.c > index 8721002..aff4778 100644 > --- a/drivers/edac/sb_edac.c > +++ b/drivers/edac/sb_edac.c > @@ -110,6 +110,11 @@ static const u32 knl_interleave_list[] = { > 0xdc, 0xe4, 0xec, 0xf4, 0xfc, /* 15-19 */ > 0x104, 0x10c, 0x114, 0x11c, /* 20-23 */ > }; > +#define MAX_INTERLEAVE \ > + (max_t(unsigned int, ARRAY_SIZE(sbridge_interleave_list), \ > + max_t(unsigned int, ARRAY_SIZE(ibridge_interleave_list), \ > + ARRAY_SIZE(knl_interleave_list)))) > + > > struct interleave_pkg { > unsigned char start; > @@ -1899,7 +1904,7 @@ static int get_memory_error_data(struct mem_ctl_info *mci, > int n_rir, n_sads, n_tads, sad_way, sck_xch; > int sad_interl, idx, base_ch; > int interleave_mode, shiftup = 0; > - unsigned sad_interleave[pvt->info.max_interleave]; Where's the hunk removing ->max_interleave ? -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply.