d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

hwpmc: don't use deprecated copystr(9)

Browse Source 
It is just wrapper around strlcpy(), but results in more complicated
code. Clean this up to use strlcpy() or snprintf() as appropriate.

Reviewed by:	jkoshy
MFC after:	2 weeks
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D39910
This commit is contained in:
Mitchell Horne 2023-05-05 18:59:15 -03:00
parent aba91805aa
commit 31610e34b7
10 changed files with 24 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
sys/dev/hwpmc/hwpmc_amd.c
View File

@ -905,8 +905,6 @@ amd_intr(struct trapframe *tf)
static int
amd_describe(int cpu, int ri, struct pmc_info *pi, struct pmc **ppmc)
{
int error;
size_t copied;
const struct amd_descr *pd;
struct pmc_hw *phw;
@ -918,10 +916,7 @@ amd_describe(int cpu, int ri, struct pmc_info *pi, struct pmc **ppmc)
phw = &amd_pcpu[cpu]->pc_amdpmcs[ri];
pd = &amd_pmcdesc[ri];
if ((error = copystr(pd->pm_descr.pd_name, pi->pm_name,
PMC_NAME_MAX, &copied)) != 0)
return error;
strlcpy(pi->pm_name, pd->pm_descr.pd_name, sizeof(pi->pm_name));
pi->pm_class = pd->pm_descr.pd_class;
if (phw->phw_state & PMC_PHW_FLAG_IS_ENABLED) {

9
sys/dev/hwpmc/hwpmc_arm64.c
View File

@ -416,9 +416,7 @@ arm64_intr(struct trapframe *tf)
static int
arm64_describe(int cpu, int ri, struct pmc_info *pi, struct pmc **ppmc)
{
char arm64_name[PMC_NAME_MAX];
struct pmc_hw *phw;
int error;
KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),
("[arm64,%d], illegal CPU %d", __LINE__, cpu));
@ -426,11 +424,10 @@ arm64_describe(int cpu, int ri, struct pmc_info *pi, struct pmc **ppmc)
("[arm64,%d] row-index %d out of range", __LINE__, ri));
phw = &arm64_pcpu[cpu]->pc_arm64pmcs[ri];
snprintf(arm64_name, sizeof(arm64_name), "ARMV8-%d", ri);
if ((error = copystr(arm64_name, pi->pm_name, PMC_NAME_MAX,
NULL)) != 0)
return (error);
snprintf(pi->pm_name, sizeof(pi->pm_name), "ARMV8-%d", ri);
pi->pm_class = PMC_CLASS_ARMV8;
if (phw->phw_state & PMC_PHW_FLAG_IS_ENABLED) {
pi->pm_enabled = TRUE;
*ppmc = phw->phw_pmc;

9
sys/dev/hwpmc/hwpmc_armv7.c
View File

@ -384,9 +384,7 @@ armv7_intr(struct trapframe *tf)
static int
armv7_describe(int cpu, int ri, struct pmc_info *pi, struct pmc **ppmc)
{
char armv7_name[PMC_NAME_MAX];
struct pmc_hw *phw;
int error;
KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),
("[armv7,%d], illegal CPU %d", __LINE__, cpu));
@ -394,11 +392,10 @@ armv7_describe(int cpu, int ri, struct pmc_info *pi, struct pmc **ppmc)
("[armv7,%d] row-index %d out of range", __LINE__, ri));
phw = &armv7_pcpu[cpu]->pc_armv7pmcs[ri];
snprintf(armv7_name, sizeof(armv7_name), "ARMV7-%d", ri);
if ((error = copystr(armv7_name, pi->pm_name, PMC_NAME_MAX,
NULL)) != 0)
return error;
snprintf(pi->pm_name, sizeof(pi->pm_name), "ARMV7-%d", ri);
pi->pm_class = PMC_CLASS_ARMV7;
if (phw->phw_state & PMC_PHW_FLAG_IS_ENABLED) {
pi->pm_enabled = TRUE;
*ppmc = phw->phw_pmc;

11
sys/dev/hwpmc/hwpmc_cmn600.c
View File

@ -587,9 +587,8 @@ cmn600_stop_pmc(int cpu, int ri)
static int
cmn600_describe(int cpu, int ri, struct pmc_info *pi, struct pmc **ppmc)
{
struct pmc_descr *pd;
struct pmc_hw *phw;
size_t copied;
int error;
KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),
("[cmn600,%d] illegal CPU %d", __LINE__, cpu));
@ -597,12 +596,10 @@ cmn600_describe(int cpu, int ri, struct pmc_info *pi, struct pmc **ppmc)
ri));
phw = cmn600desc(ri)->pd_phw;
pd = &cmn600desc(ri)->pd_descr;
if ((error = copystr(cmn600desc(ri)->pd_descr.pd_name,
pi->pm_name, PMC_NAME_MAX, &copied)) != 0)
return (error);
pi->pm_class = cmn600desc(ri)->pd_descr.pd_class;
strlcpy(pi->pm_name, pd->pd_name, sizeof(pi->pm_name));
pi->pm_class = pd->pd_class;
if (phw->phw_state & PMC_PHW_FLAG_IS_ENABLED) {
pi->pm_enabled = TRUE;

16
sys/dev/hwpmc/hwpmc_core.c
View File

@ -330,17 +330,11 @@ iaf_config_pmc(int cpu, int ri, struct pmc *pm)
static int
iaf_describe(int cpu, int ri, struct pmc_info *pi, struct pmc **ppmc)
{
int error;
struct pmc_hw *phw;
char iaf_name[PMC_NAME_MAX];
phw = &core_pcpu[cpu]->pc_corepmcs[ri + core_iaf_ri];
(void) snprintf(iaf_name, sizeof(iaf_name), "IAF-%d", ri);
if ((error = copystr(iaf_name, pi->pm_name, PMC_NAME_MAX,
NULL)) != 0)
return (error);
snprintf(pi->pm_name, sizeof(pi->pm_name), "IAF-%d", ri);
pi->pm_class = PMC_CLASS_IAF;
if (phw->phw_state & PMC_PHW_FLAG_IS_ENABLED) {
@ -814,17 +808,11 @@ iap_config_pmc(int cpu, int ri, struct pmc *pm)
static int
iap_describe(int cpu, int ri, struct pmc_info *pi, struct pmc **ppmc)
{
int error;
struct pmc_hw *phw;
char iap_name[PMC_NAME_MAX];
phw = &core_pcpu[cpu]->pc_corepmcs[ri];
(void) snprintf(iap_name, sizeof(iap_name), "IAP-%d", ri);
if ((error = copystr(iap_name, pi->pm_name, PMC_NAME_MAX,
NULL)) != 0)
return (error);
snprintf(pi->pm_name, sizeof(pi->pm_name), "IAP-%d", ri);
pi->pm_class = PMC_CLASS_IAP;
if (phw->phw_state & PMC_PHW_FLAG_IS_ENABLED) {

11
sys/dev/hwpmc/hwpmc_dmc620.c
View File

@ -454,9 +454,8 @@ CLASSDEP_FN2(dmc620_stop_pmc, int, cpu, int, ri)
CLASSDEP_FN4(dmc620_describe, int, cpu, int, ri, struct pmc_info *, pi,
struct pmc **, ppmc)
{
struct pmc_descr *pd;
struct pmc_hw *phw;
size_t copied;
int error;
KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),
("[dmc620,%d] illegal CPU %d", __LINE__, cpu));
@ -464,12 +463,10 @@ CLASSDEP_FN4(dmc620_describe, int, cpu, int, ri, struct pmc_info *, pi,
ri));
phw = dmc620desc(class, cpu, ri)->pd_phw;
pd = &dmc620desc(class, cpu, ri)->pd_descr;
if ((error = copystr(dmc620desc(class, cpu, ri)->pd_descr.pd_name,
pi->pm_name, PMC_NAME_MAX, &copied)) != 0)
return (error);
pi->pm_class = dmc620desc(class, cpu, ri)->pd_descr.pd_class;
strlcpy(pi->pm_name, pd->pd_name, sizeof(pi->pm_name));
pi->pm_class = pd->pd_class;
if (phw->phw_state & PMC_PHW_FLAG_IS_ENABLED) {
pi->pm_enabled = TRUE;

9
sys/dev/hwpmc/hwpmc_powerpc.c
View File

@ -122,19 +122,16 @@ powerpc_switch_out(struct pmc_cpu *pc, struct pmc_process *pp)
int
powerpc_describe(int cpu, int ri, struct pmc_info *pi, struct pmc **ppmc)
{
int error;
struct pmc_hw *phw;
char powerpc_name[PMC_NAME_MAX];
KASSERT(cpu >= 0 && cpu < pmc_cpu_max(),
("[powerpc,%d], illegal CPU %d", __LINE__, cpu));
phw = &powerpc_pcpu[cpu]->pc_ppcpmcs[ri];
snprintf(powerpc_name, sizeof(powerpc_name), "POWERPC-%d", ri);
if ((error = copystr(powerpc_name, pi->pm_name, PMC_NAME_MAX,
NULL)) != 0)
return error;
snprintf(pi->pm_name, sizeof(pi->pm_name), "POWERPC-%d", ri);
pi->pm_class = powerpc_pcpu[cpu]->pc_class;
if (phw->phw_state & PMC_PHW_FLAG_IS_ENABLED) {
pi->pm_enabled = TRUE;
*ppmc = phw->phw_pmc;

7
sys/dev/hwpmc/hwpmc_soft.c
View File

@ -159,8 +159,6 @@ soft_config_pmc(int cpu, int ri, struct pmc *pm)
static int
soft_describe(int cpu, int ri, struct pmc_info *pi, struct pmc **ppmc)
{
int error;
size_t copied;
const struct soft_descr *pd;
struct pmc_hw *phw;
@ -172,10 +170,7 @@ soft_describe(int cpu, int ri, struct pmc_info *pi, struct pmc **ppmc)
phw = &soft_pcpu[cpu]->soft_hw[ri];
pd = &soft_pmcdesc[ri];
if ((error = copystr(pd->pm_descr.pd_name, pi->pm_name,
PMC_NAME_MAX, &copied)) != 0)
return (error);
strlcpy(pi->pm_name, pd->pm_descr.pd_name, sizeof(pi->pm_name));
pi->pm_class = pd->pm_descr.pd_class;
if (phw->phw_state & PMC_PHW_FLAG_IS_ENABLED) {

7
sys/dev/hwpmc/hwpmc_tsc.c
View File

@ -115,8 +115,6 @@ tsc_config_pmc(int cpu, int ri, struct pmc *pm)
static int
tsc_describe(int cpu, int ri, struct pmc_info *pi, struct pmc **ppmc)
{
int error;
size_t copied;
const struct tsc_descr *pd;
struct pmc_hw *phw;
@ -127,10 +125,7 @@ tsc_describe(int cpu, int ri, struct pmc_info *pi, struct pmc **ppmc)
phw = &tsc_pcpu[cpu]->tc_hw;
pd = &tsc_pmcdesc[ri];
if ((error = copystr(pd->pm_descr.pd_name, pi->pm_name,
PMC_NAME_MAX, &copied)) != 0)
return (error);
strlcpy(pi->pm_name, pd->pm_descr.pd_name, sizeof(pi->pm_name));
pi->pm_class = pd->pm_descr.pd_class;
if (phw->phw_state & PMC_PHW_FLAG_IS_ENABLED) {

16
sys/dev/hwpmc/hwpmc_uncore.c
View File

@ -233,17 +233,11 @@ ucf_config_pmc(int cpu, int ri, struct pmc *pm)
static int
ucf_describe(int cpu, int ri, struct pmc_info *pi, struct pmc **ppmc)
{
int error;
struct pmc_hw *phw;
char ucf_name[PMC_NAME_MAX];
phw = &uncore_pcpu[cpu]->pc_uncorepmcs[ri + uncore_ucf_ri];
(void) snprintf(ucf_name, sizeof(ucf_name), "UCF-%d", ri);
if ((error = copystr(ucf_name, pi->pm_name, PMC_NAME_MAX,
NULL)) != 0)
return (error);
snprintf(pi->pm_name, sizeof(pi->pm_name), "UCF-%d", ri);
pi->pm_class = PMC_CLASS_UCF;
if (phw->phw_state & PMC_PHW_FLAG_IS_ENABLED) {
@ -560,17 +554,11 @@ ucp_config_pmc(int cpu, int ri, struct pmc *pm)
static int
ucp_describe(int cpu, int ri, struct pmc_info *pi, struct pmc **ppmc)
{
int error;
struct pmc_hw *phw;
char ucp_name[PMC_NAME_MAX];
phw = &uncore_pcpu[cpu]->pc_uncorepmcs[ri];
(void) snprintf(ucp_name, sizeof(ucp_name), "UCP-%d", ri);
if ((error = copystr(ucp_name, pi->pm_name, PMC_NAME_MAX,
NULL)) != 0)
return (error);
snprintf(pi->pm_name, sizeof(pi->pm_name), "UCP-%d", ri);
pi->pm_class = PMC_CLASS_UCP;
if (phw->phw_state & PMC_PHW_FLAG_IS_ENABLED) {