From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id DF614C433F5 for ; Wed, 25 May 2022 19:59:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:In-Reply-To:MIME-Version:References: Message-ID:Subject:Cc:To:From:Date:Reply-To:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=1W4vtEzTEeVWIc+a8i00aHeRfydIbkmSh/an9UmxtYU=; b=25F45hyTebWejO x0CmcSGSple9r4WPvxH7CZreAn0vbhX0g2GgwsYTo8VoGAnWQAnUjRpz2+bFhOYpzC4kF37fV92Z5 DX0PVf238CSFx2yWv9MZGQtjaJD1xbBl7bsQpXLsWh7eTr8Auyr61vehe+xzrRCGfVMVwY5BKUOxi y8frp3cdCDX3EmTebg9GaX322mkVmZN43m+Mi3isWlvE5Tc6u1gIHFiGIOjGcsldgz6gc0qSnjhVH bNzSaGbz0ixYJXuT96bd6Gq52DfeqxBNseCur3CzC8KL+Zx26yDDCZGEMQ+J5PKF5ZmevKM2kUOyJ hhyLPlgA2nRS0lFfvkWA==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.94.2 #2 (Red Hat Linux)) id 1ntx8t-00CZep-Mu; Wed, 25 May 2022 19:58:05 +0000 Received: from mail-pf1-x432.google.com ([2607:f8b0:4864:20::432]) by bombadil.infradead.org with esmtps (Exim 4.94.2 #2 (Red Hat Linux)) id 1ntx8f-00CZbA-Te for linux-arm-kernel@lists.infradead.org; Wed, 25 May 2022 19:57:52 +0000 Received: by mail-pf1-x432.google.com with SMTP id j6so20109885pfe.13 for ; Wed, 25 May 2022 12:57:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to; bh=qIJ7d+dSGRxET8dSrCZL7pfk01JGNrPbNSS4rOJh0VA=; b=NRW14s7D4GfuN8q8+OG0U5qWA7+O2m51krjj4BQ7dnUSw3l2tgJTxKTaJOOboeBvZP Q/PML8iC/pZNzMaz0onDjcT0vGXWVcXZm3oV378hXKwqGh/Eg0YNC3Rd3I+lQQZcohRN 6giEIagJvDtjaTduuQWDZbbHB4oxcQGaFyjeGdjuc0OkrKFy4ZF+wdov8YA4jzlvRSuu LCDleR7fkjD1L7YdAEOawvbEgEQfWkOiWAQB4CHYEQA9U/xcBOu/96jdyEpyBVl6XWVi oV/1+zHsbNqdjPe9hcvnXxeC7crhgYKIh67sCJ25TKL6yanmIt+jghGmPJEqHvY6lDZ4 U1/Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to; bh=qIJ7d+dSGRxET8dSrCZL7pfk01JGNrPbNSS4rOJh0VA=; b=XUZULHAACPZ4/iWUC0yeyDbNdLoChett1pME5MblWyZDsjEhY5gCLmF1LXyNPoYO6z PrHZSBCC2cH5uGp4Lsl1kRD6pg16JhpwbOSOJOH2zzb90uw+W9ICctmS33yw/tKGEEWE EkqnQSVymRN064dT8pl0O4IIDm2pmWt8r412BeRLlIwIvM7U5EAROh8kvmHaVdkM869N N2iNxs2csbxqRY6IDMVUFQtclEMYDFg+otfm06KeGTjbuzEV9Wk9GTNkJorT/fRSoIG9 htp+FK2p2xnOxuxILhnQWNOPml94X1EPVuyA3dVR2BKNCaQAKbQq07Gfy3r5pEKMeDUF 95rQ== X-Gm-Message-State: AOAM532o49EzmWuNKOZ/JJO+xlHEVmOUOkgme9P8jLgDmwDXpmM0XDOS DfH7shjn+lIaSLvFkny29zg0I2OJ4Pr4iw== X-Google-Smtp-Source: ABdhPJwvS6LyT310QwSdSfzMw2Z7N2TvkGGy4cmtASvV+sQ8c5jIsbvPKa1Pevrf5xrgH2uw+N8ATA== X-Received: by 2002:a05:6a00:2483:b0:518:751f:9152 with SMTP id c3-20020a056a00248300b00518751f9152mr26437005pfv.47.1653508665968; Wed, 25 May 2022 12:57:45 -0700 (PDT) Received: from p14s (S0106889e681aac74.cg.shawcable.net. [68.147.0.187]) by smtp.gmail.com with ESMTPSA id a8-20020a1709027d8800b00162529828aesm3138587plm.109.2022.05.25.12.57.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 25 May 2022 12:57:44 -0700 (PDT) Date: Wed, 25 May 2022 13:57:42 -0600 From: Mathieu Poirier To: Mike Leach Cc: linux-arm-kernel@lists.infradead.org, coresight@lists.linaro.org, suzuki.poulose@arm.com, leo.yan@linaro.org Subject: Re: [PATCH v3 3/5] coresight: configfs: Modify config files to allow userspace use Message-ID: <20220525195742.GB273925@p14s> References: <20220414064457.12052-1-mike.leach@linaro.org> <20220414064457.12052-4-mike.leach@linaro.org> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20220414064457.12052-4-mike.leach@linaro.org> X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20220525_125750_037751_2A15A025 X-CRM114-Status: GOOD ( 36.09 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org On Thu, Apr 14, 2022 at 07:44:55AM +0100, Mike Leach wrote: > Update coresight-config.h and the coresight-config-file.c & .h > to allow use in userspace programs. > > Use __KERNEL__ defines to filter out driver only structures and > elements so that user space programs can use the descriptor structures. > > Abstract memory allocation in coresight-config-file.c to allow read > file functions to be run in userspace and kernel drivers. > > Signed-off-by: Mike Leach > --- > .../coresight/coresight-config-file.c | 95 +++++++++++++------ > .../hwtracing/coresight/coresight-config.h | 12 +++ > 2 files changed, 80 insertions(+), 27 deletions(-) > > diff --git a/drivers/hwtracing/coresight/coresight-config-file.c b/drivers/hwtracing/coresight/coresight-config-file.c > index 3fd001938324..5b8f635ac50e 100644 > --- a/drivers/hwtracing/coresight/coresight-config-file.c > +++ b/drivers/hwtracing/coresight/coresight-config-file.c > @@ -6,8 +6,57 @@ > > #include "coresight-config.h" > #include "coresight-config-file.h" > + > +/* > + * To allow reuse of this source in tools, define memory allocation fns according > + * to build environment. > + */ > + > +#ifdef __KERNEL__ > #include "coresight-syscfg.h" > > +static void *cscfg_calloc(size_t num, size_t size) > +{ > + return devm_kcalloc(cscfg_device(), num, size, GFP_KERNEL); > +} > + > +static char *cscfg_strdup(const char *str) > +{ > + return devm_kstrdup(cscfg_device(), str, GFP_KERNEL); > +} > + > +static void *cscfg_zalloc(size_t size) > +{ > + return devm_kzalloc(cscfg_device(), size, GFP_KERNEL); > +} > + > +#else > + > +#include > +#include > +#include > + > +static void *cscfg_calloc(size_t num, size_t size) > +{ > + return calloc(num, size); > +} > + > +static char *cscfg_strdup(const char *str) > +{ > + return strdup(str); > +} > + > +static void *cscfg_zalloc(size_t size) > +{ > + void *ptr = malloc(size); > + > + if (ptr) > + memset(ptr, 0, size); > + return ptr; > +} > + > +#endif > + > #define cscfg_extract_u64(val64) { \ > val64 = *(u64 *)(buffer + used); \ > used += sizeof(u64); \ > @@ -80,6 +129,7 @@ static int cscfg_file_read_elem_str(const u8 *buffer, const int buflen, int *buf > struct cscfg_file_elem_str *elem_str) > { > int used = *buf_used; > + const u8 *str; > > if ((buflen - used) < sizeof(u16)) > return -EINVAL; > @@ -89,11 +139,13 @@ static int cscfg_file_read_elem_str(const u8 *buffer, const int buflen, int *buf > if ((buflen - used) < elem_str->str_len) > return -EINVAL; > > + str = buffer + used; > + > /* check for 0 termination */ > - if (buffer[elem_str->str_len - 1] != 0) > + if (str[elem_str->str_len - 1] != 0) > return -EINVAL; > Now it makes sense. > - elem_str->str = devm_kstrdup(cscfg_device(), (char *)buffer, GFP_KERNEL); > + elem_str->str = cscfg_strdup((char *)str); > used += elem_str->str_len; > > *buf_used = used; > @@ -104,14 +156,12 @@ static int cscfg_file_alloc_desc_arrays(struct cscfg_fs_load_descs *desc_arrays, > int nr_features) > { > /* arrays are 0 terminated - max of 1 config & nr_features features */ > - desc_arrays->config_descs = devm_kcalloc(cscfg_device(), 2, > - sizeof(struct cscfg_config_desc *), > - GFP_KERNEL); > + desc_arrays->config_descs = cscfg_calloc(2, sizeof(struct cscfg_config_desc *)); > if (!desc_arrays->config_descs) > return -ENOMEM; > - desc_arrays->feat_descs = devm_kcalloc(cscfg_device(), nr_features + 1, > - sizeof(struct cscfg_feature_desc *), > - GFP_KERNEL); > + > + desc_arrays->feat_descs = cscfg_calloc(nr_features + 1, > + sizeof(struct cscfg_feature_desc *)); > if (!desc_arrays->feat_descs) > return -ENOMEM; > return 0; > @@ -138,8 +188,7 @@ static int cscfg_file_read_elem_config(const u8 *buffer, const int buflen, int * > return 0; > > /* we have a config - allocate the descriptor */ > - config_desc = devm_kzalloc(cscfg_device(), sizeof(struct cscfg_config_desc), > - GFP_KERNEL); > + config_desc = cscfg_zalloc(sizeof(struct cscfg_config_desc)); > if (!config_desc) > return -ENOMEM; > > @@ -165,8 +214,7 @@ static int cscfg_file_read_elem_config(const u8 *buffer, const int buflen, int * > /* read the array of 64bit presets if present */ > nr_preset_vals = config_desc->nr_total_params * config_desc->nr_presets; > if (nr_preset_vals) { > - presets = devm_kcalloc(cscfg_device(), nr_preset_vals, > - sizeof(u64), GFP_KERNEL); > + presets = cscfg_calloc(nr_preset_vals, sizeof(u64)); > if (!presets) > return -ENOMEM; > > @@ -181,10 +229,8 @@ static int cscfg_file_read_elem_config(const u8 *buffer, const int buflen, int * > > /* read the array of feature names referenced by the config */ > if (config_desc->nr_feat_refs) { > - config_desc->feat_ref_names = devm_kcalloc(cscfg_device(), > - config_desc->nr_feat_refs, > - sizeof(char *), > - GFP_KERNEL); > + config_desc->feat_ref_names = cscfg_calloc(config_desc->nr_feat_refs, > + sizeof(char *)); > if (!config_desc->feat_ref_names) > return -ENOMEM; > > @@ -262,8 +308,7 @@ static int cscfg_file_read_elem_feature(const u8 *buffer, const int buflen, int > u32 val32; > > /* allocate the feature descriptor object */ > - feat_desc = devm_kzalloc(cscfg_device(), sizeof(struct cscfg_feature_desc), > - GFP_KERNEL); > + feat_desc = cscfg_zalloc(sizeof(struct cscfg_feature_desc)); > if (!feat_desc) > return -ENOMEM; > > @@ -302,10 +347,8 @@ static int cscfg_file_read_elem_feature(const u8 *buffer, const int buflen, int > nr_regs_bytes = ((sizeof(u32) + sizeof(u64)) * feat_desc->nr_regs); > if ((buflen - used) < nr_regs_bytes) > return -EINVAL; > - feat_desc->regs_desc = devm_kcalloc(cscfg_device(), > - feat_desc->nr_regs, > - sizeof(struct cscfg_regval_desc), > - GFP_KERNEL); > + feat_desc->regs_desc = cscfg_calloc(feat_desc->nr_regs, > + sizeof(struct cscfg_regval_desc)); > if (!feat_desc->regs_desc) > return -ENOMEM; > > @@ -319,10 +362,8 @@ static int cscfg_file_read_elem_feature(const u8 *buffer, const int buflen, int > > /* parameter descriptors - string + 64 bit value */ > if (feat_desc->nr_params) { > - feat_desc->params_desc = devm_kcalloc(cscfg_device(), > - feat_desc->nr_params, > - sizeof(struct cscfg_parameter_desc), > - GFP_KERNEL); > + feat_desc->params_desc = cscfg_calloc(feat_desc->nr_params, > + sizeof(struct cscfg_parameter_desc)); > if (!feat_desc->params_desc) > return -ENOMEM; > for (i = 0; i < feat_desc->nr_params; i++) { > @@ -399,7 +440,7 @@ int cscfg_file_read_buffer(const u8 *buffer, const int buflen, > if (err) > return err; > } > - return used; > + return 0; This belongs in patch 1. > } > > int cscfg_file_read_buffer_first_name(const u8 *buffer, const int buflen, > diff --git a/drivers/hwtracing/coresight/coresight-config.h b/drivers/hwtracing/coresight/coresight-config.h > index 9cd3c26ce023..fce74e2fbd0c 100644 > --- a/drivers/hwtracing/coresight/coresight-config.h > +++ b/drivers/hwtracing/coresight/coresight-config.h > @@ -7,7 +7,14 @@ > #ifndef _CORESIGHT_CORESIGHT_CONFIG_H > #define _CORESIGHT_CORESIGHT_CONFIG_H > > +/* > + * Filter out kernel only portions of the file to allow user space programs > + * to use the descriptor definitions. > + */ > +#ifdef __KERNEL__ > #include > +#endif > + > #include > > /* CoreSight Configuration Management - component and system wide configuration */ > @@ -100,6 +107,10 @@ struct cscfg_fs_load_descs { > struct cscfg_feature_desc **feat_descs; > }; > > + > +/* remainder of header is used by the kernel drivers only */ > +#ifdef __KERNEL__ > + > /** > * Device feature descriptor - combination of registers and parameters to > * program a device to implement a specific complex function. > @@ -272,4 +283,5 @@ void cscfg_csdev_disable_config(struct cscfg_config_csdev *config_csdev); > /* reset a feature to default values */ > void cscfg_reset_feat(struct cscfg_feature_csdev *feat_csdev); > > +#endif /* __KERNEL__ */ > #endif /* _CORESIGHT_CORESIGHT_CONFIG_H */ > -- > 2.17.1 > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel