Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S969579AbdDTLWb (ORCPT ); Thu, 20 Apr 2017 07:22:31 -0400 Received: from mail.skyhub.de ([5.9.137.197]:60784 "EHLO mail.skyhub.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S969475AbdDTLW0 (ORCPT ); Thu, 20 Apr 2017 07:22:26 -0400 Date: Thu, 20 Apr 2017 13:14:51 +0200 From: Borislav Petkov To: Tyler Baicar Cc: christoffer.dall@linaro.org, marc.zyngier@arm.com, pbonzini@redhat.com, rkrcmar@redhat.com, linux@armlinux.org.uk, catalin.marinas@arm.com, will.deacon@arm.com, rjw@rjwysocki.net, lenb@kernel.org, matt@codeblueprint.co.uk, robert.moore@intel.com, lv.zheng@intel.com, nkaje@codeaurora.org, zjzhang@codeaurora.org, mark.rutland@arm.com, james.morse@arm.com, akpm@linux-foundation.org, eun.taik.lee@samsung.com, sandeepa.s.prabhu@gmail.com, labbott@redhat.com, shijie.huang@arm.com, rruigrok@codeaurora.org, paul.gortmaker@windriver.com, tn@semihalf.com, fu.wei@linaro.org, rostedt@goodmis.org, bristot@redhat.com, linux-arm-kernel@lists.infradead.org, kvmarm@lists.cs.columbia.edu, kvm@vger.kernel.org, linux-kernel@vger.kernel.org, linux-acpi@vger.kernel.org, linux-efi@vger.kernel.org, devel@acpica.org, Suzuki.Poulose@arm.com, punit.agrawal@arm.com, astone@redhat.com, harba@codeaurora.org, hanjun.guo@linaro.org, john.garry@huawei.com, shiju.jose@huawei.com, joe@perches.com, rafael@kernel.org, tony.luck@intel.com, gengdongjiu@huawei.com, xiexiuqi@huawei.com Subject: Re: [PATCH V15 02/11] ras: acpi/apei: cper: add support for generic data v3 structure Message-ID: <20170420111451.6mo4o2oulwal3j33@pd.tnic> References: <1492556723-9189-1-git-send-email-tbaicar@codeaurora.org> <1492556723-9189-3-git-send-email-tbaicar@codeaurora.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Disposition: inline In-Reply-To: <1492556723-9189-3-git-send-email-tbaicar@codeaurora.org> User-Agent: NeoMutt/20170113 (1.7.2) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 7489 Lines: 215 On Tue, Apr 18, 2017 at 05:05:14PM -0600, Tyler Baicar wrote: > The ACPI 6.1 spec adds a new version of the generic data structure. which data structure? HEST? > Add support to handle the new structure as well as properly verify > and iterate through the generic data entries. > > Signed-off-by: Tyler Baicar > CC: Jonathan (Zhixiong) Zhang > Reviewed-by: James Morse > Reviewed-by: Ard Biesheuvel This is clearly a new version of the patch so Reviewed-by tags don't apply anymore. Ditto for the next one. Remember to remove such tags in the future when the patches are changed non-trivially in a following iteration. > --- > drivers/acpi/apei/ghes.c | 6 +++--- > drivers/firmware/efi/cper.c | 37 ++++++++++++++++++++++--------------- > include/acpi/ghes.h | 22 ++++++++++++++++++++++ > 3 files changed, 47 insertions(+), 18 deletions(-) > > diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c > index 6d87ab7..dfb7dd2 100644 > --- a/drivers/acpi/apei/ghes.c > +++ b/drivers/acpi/apei/ghes.c > @@ -429,7 +429,7 @@ static void ghes_handle_memory_failure(struct acpi_hest_generic_data *gdata, int > int flags = -1; > int sec_sev = ghes_severity(gdata->error_severity); > struct cper_sec_mem_err *mem_err; > - mem_err = (struct cper_sec_mem_err *)(gdata + 1); > + mem_err = acpi_hest_get_payload(gdata); struct cper_sec_mem_err *mem_err = acpi_hest_get_payload(gdata); while you're at it. > if (!(mem_err->validation_bits & CPER_MEM_VALID_PA)) > return; > @@ -466,7 +466,7 @@ static void ghes_do_proc(struct ghes *ghes, > if (!uuid_le_cmp(*(uuid_le *)gdata->section_type, > CPER_SEC_PLATFORM_MEM)) { > struct cper_sec_mem_err *mem_err; > - mem_err = (struct cper_sec_mem_err *)(gdata+1); > + mem_err = acpi_hest_get_payload(gdata); Ditto + add a \n here. > ghes_edac_report_mem_error(ghes, sev, mem_err); > > arch_apei_report_mem_error(sev, mem_err); > @@ -476,7 +476,7 @@ static void ghes_do_proc(struct ghes *ghes, > else if (!uuid_le_cmp(*(uuid_le *)gdata->section_type, > CPER_SEC_PCIE)) { > struct cper_sec_pcie *pcie_err; > - pcie_err = (struct cper_sec_pcie *)(gdata+1); > + pcie_err = acpi_hest_get_payload(gdata); Ditto. > if (sev == GHES_SEV_RECOVERABLE && > sec_sev == GHES_SEV_RECOVERABLE && > pcie_err->validation_bits & CPER_PCIE_VALID_DEVICE_ID && > diff --git a/drivers/firmware/efi/cper.c b/drivers/firmware/efi/cper.c > index d425374..8328a6f 100644 > --- a/drivers/firmware/efi/cper.c > +++ b/drivers/firmware/efi/cper.c > @@ -32,6 +32,7 @@ > #include > #include > #include > +#include > > #define INDENT_SP " " > > @@ -386,8 +387,9 @@ static void cper_print_pcie(const char *pfx, const struct cper_sec_pcie *pcie, > pfx, pcie->bridge.secondary_status, pcie->bridge.control); > } > > -static void cper_estatus_print_section( > - const char *pfx, const struct acpi_hest_generic_data *gdata, int sec_no) > +static void > +cper_estatus_print_section(const char *pfx, struct acpi_hest_generic_data *gdata, > + int sec_no) > { > uuid_le *sec_type = (uuid_le *)gdata->section_type; > __u16 severity; > @@ -403,14 +405,18 @@ static void cper_estatus_print_section( > > snprintf(newpfx, sizeof(newpfx), "%s%s", pfx, INDENT_SP); > if (!uuid_le_cmp(*sec_type, CPER_SEC_PROC_GENERIC)) { > - struct cper_sec_proc_generic *proc_err = (void *)(gdata + 1); > + struct cper_sec_proc_generic *proc_err; > + > + proc_err = acpi_hest_get_payload(gdata); Ditto. > printk("%s""section_type: general processor error\n", newpfx); > if (gdata->error_data_length >= sizeof(*proc_err)) > cper_print_proc_generic(newpfx, proc_err); > else > goto err_section_too_small; > } else if (!uuid_le_cmp(*sec_type, CPER_SEC_PLATFORM_MEM)) { > - struct cper_sec_mem_err *mem_err = (void *)(gdata + 1); > + struct cper_sec_mem_err *mem_err; > + > + mem_err = acpi_hest_get_payload(gdata); Ditto. > printk("%s""section_type: memory error\n", newpfx); > if (gdata->error_data_length >= > sizeof(struct cper_sec_mem_err_old)) > @@ -419,7 +425,9 @@ static void cper_estatus_print_section( > else > goto err_section_too_small; > } else if (!uuid_le_cmp(*sec_type, CPER_SEC_PCIE)) { > - struct cper_sec_pcie *pcie = (void *)(gdata + 1); > + struct cper_sec_pcie *pcie; > + > + pcie = acpi_hest_get_payload(gdata); Ditto. > printk("%s""section_type: PCIe error\n", newpfx); > if (gdata->error_data_length >= sizeof(*pcie)) > cper_print_pcie(newpfx, pcie, gdata); > @@ -438,7 +446,7 @@ void cper_estatus_print(const char *pfx, > const struct acpi_hest_generic_status *estatus) > { > struct acpi_hest_generic_data *gdata; > - unsigned int data_len, gedata_len; > + unsigned int data_len; > int sec_no = 0; > char newpfx[64]; > __u16 severity; > @@ -452,11 +460,10 @@ void cper_estatus_print(const char *pfx, > data_len = estatus->data_length; > gdata = (struct acpi_hest_generic_data *)(estatus + 1); > snprintf(newpfx, sizeof(newpfx), "%s%s", pfx, INDENT_SP); > - while (data_len >= sizeof(*gdata)) { > - gedata_len = gdata->error_data_length; <-- \n here while you're at it. We have to start making this code more readable. It looks write-only right now. > + while (data_len >= acpi_hest_get_size(gdata)) { > cper_estatus_print_section(newpfx, gdata, sec_no); > - data_len -= gedata_len + sizeof(*gdata); > - gdata = (void *)(gdata + 1) + gedata_len; > + data_len -= acpi_hest_get_record_size(gdata); > + gdata = acpi_hest_get_next(gdata); > sec_no++; > } > } > @@ -486,12 +493,12 @@ int cper_estatus_check(const struct acpi_hest_generic_status *estatus) > return rc; > data_len = estatus->data_length; > gdata = (struct acpi_hest_generic_data *)(estatus + 1); > - while (data_len >= sizeof(*gdata)) { > - gedata_len = gdata->error_data_length; > - if (gedata_len > data_len - sizeof(*gdata)) Ditto. > + while (data_len >= acpi_hest_get_size(gdata)) { > + gedata_len = acpi_hest_get_error_length(gdata); > + if (gedata_len > data_len - acpi_hest_get_size(gdata)) > return -EINVAL; <-- \n here too > - data_len -= gedata_len + sizeof(*gdata); > - gdata = (void *)(gdata + 1) + gedata_len; > + data_len -= acpi_hest_get_record_size(gdata); > + gdata = acpi_hest_get_next(gdata); > } > if (data_len) > return -EINVAL; > diff --git a/include/acpi/ghes.h b/include/acpi/ghes.h > index 68f088a..b89361a 100644 > --- a/include/acpi/ghes.h > +++ b/include/acpi/ghes.h > @@ -12,6 +12,20 @@ > #define GHES_TO_CLEAR 0x0001 > #define GHES_EXITING 0x0002 > > +#define acpi_hest_get_error_length(gdata) \ > + (((struct acpi_hest_generic_data *)(gdata))->error_data_length) > +#define acpi_hest_get_size(gdata) \ > + ((acpi_hest_get_version(gdata) >= 3) ? \ > + sizeof(struct acpi_hest_generic_data_v300) : \ > + sizeof(struct acpi_hest_generic_data)) > +#define acpi_hest_get_record_size(gdata) \ > + (acpi_hest_get_size(gdata) + \ > + acpi_hest_get_error_length(gdata)) > +#define acpi_hest_get_next(gdata) \ > + ((void *)(gdata) + acpi_hest_get_record_size(gdata)) > +#define acpi_hest_get_version(gdata) \ > + (gdata->revision >> 8) Make all those inline functions. -- Regards/Gruss, Boris. Good mailing practices for 400: avoid top-posting and trim the reply.