Skip to content

Commit

Permalink
libpfm4: update to commit efd10fb
Browse files Browse the repository at this point in the history
Original commit:

    Author: William Cohen <wcohen@redhat.com>
    Date:   Fri Jun 30 15:06:22 2023 -0400

        Correct the arguments in a number of printf statements

        Adjusted the printf statements to fix the following issues flagged by
        static analsysis:

         Error: PRINTF_ARGS (CWE-685): [#def66]
         libpfm-4.13.0/lib/pfmlib_intel_x86.c:87: extra_argument: This argument was not used by the format string: "e->fstr".
         #   85|                __pfm_vbprintf(" any=%d", reg.sel_anythr);
         #   86|
         #   87|->      __pfm_vbprintf("]", e->fstr);
         #   88|
         #   89|        for (i = 1 ; i < e->count; i++)

         Error: PRINTF_ARGS (CWE-685): [#def11]
         libpfm-4.13.0/lib/pfmlib_amd64_perf_event.c:78: missing_argument: No argument for format specifier "%d".
         #   76|
         #   77|        if (e->count > 1) {
         #   78|->              DPRINT("%s: unsupported count=%d\n", e->count);
         #   79|                return PFM_ERR_NOTSUPP;
         #   80|        }

         Error: PRINTF_ARGS (CWE-685): [#def14]
         libpfm-4.13.0/lib/pfmlib_common.c:1151: missing_argument: No argument for format specifier "%d".
         # 1149|
         # 1150|                if (pfmlib_is_blacklisted_pmu(p)) {
         # 1151|->                      DPRINT("%d PMU blacklisted, skipping initialization\n");
         # 1152|                        continue;
         # 1153|                }

         Error: PRINTF_ARGS (CWE-685): [#def15]
         libpfm-4.13.0/lib/pfmlib_common.c:1367: missing_argument: No argument for format specifier "%s".
         # 1365|                        ainfo->equiv= NULL;
         # 1366|                        if (*endptr) {
         # 1367|->                              DPRINT("raw umask (%s) is not a number\n");
         # 1368|                                return PFM_ERR_ATTR;
         # 1369|

         Error: PRINTF_ARGS (CWE-685): [#def34]
         libpfm-4.13.0/lib/pfmlib_intel_skx_unc_cha.c:60: missing_argument: No argument for format specifier "%x".
         #   58|        f.val = e->codes[1];
         #   59|
         #   60|->      __pfm_vbprintf("[UNC_CHA_FILTER0=0x%"PRIx64" thread_id=%d source=0x%x state=0x%x"
         #   61|                       " state=0x%x]\n",
         #   62|                        f.val,

         Error: PRINTF_ARGS (CWE-685): [#def83]
         libpfm-4.13.0/lib/pfmlib_intel_x86_perf_event.c:100: missing_argument: No argument for format specifier "%d".
         #   98|
         #   99|        if (e->count > 2) {
         #  100|->              DPRINT("%s: unsupported count=%d\n", e->count);
         #  101|                return PFM_ERR_NOTSUPP;
         #  102|        }

        Signed-off-by: William Cohen <wcohen@redhat.com>
  • Loading branch information
gcongiu committed Aug 18, 2023
1 parent 3dcc8b1 commit 59001e2
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 7 deletions.
2 changes: 1 addition & 1 deletion src/libpfm4/lib/pfmlib_amd64_perf_event.c
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ pfm_amd64_get_perf_encoding(void *this, pfmlib_event_desc_t *e)
return ret;

if (e->count > 1) {
DPRINT("%s: unsupported count=%d\n", e->count);
DPRINT("unsupported count=%d\n", e->count);
return PFM_ERR_NOTSUPP;
}

Expand Down
4 changes: 2 additions & 2 deletions src/libpfm4/lib/pfmlib_common.c
Original file line number Diff line number Diff line change
Expand Up @@ -1191,7 +1191,7 @@ pfmlib_init_pmus(void)
continue;

if (pfmlib_is_blacklisted_pmu(p)) {
DPRINT("%d PMU blacklisted, skipping initialization\n");
DPRINT("%s PMU blacklisted, skipping initialization\n", p->name);
continue;
}
p->flags |= PFMLIB_PMU_FL_INIT;
Expand Down Expand Up @@ -1429,7 +1429,7 @@ pfmlib_parse_event_attr(char *str, pfmlib_event_desc_t *d)
ainfo->idx = strtoull(s, &endptr, 0);
ainfo->equiv= NULL;
if (*endptr) {
DPRINT("raw umask (%s) is not a number\n");
DPRINT("raw umask (%s) is not a number\n", str);
return PFM_ERR_ATTR;
}

Expand Down
3 changes: 1 addition & 2 deletions src/libpfm4/lib/pfmlib_intel_skx_unc_cha.c
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,7 @@ display_cha(void *this, pfmlib_event_desc_t *e, void *val)

f.val = e->codes[1];

__pfm_vbprintf("[UNC_CHA_FILTER0=0x%"PRIx64" thread_id=%d source=0x%x state=0x%x"
" state=0x%x]\n",
__pfm_vbprintf("[UNC_CHA_FILTER0=0x%"PRIx64" thread_id=%d source=0x%x state=0x%x]\n",
f.val,
f.skx_cha_filt0.tid,
f.skx_cha_filt0.sid,
Expand Down
2 changes: 1 addition & 1 deletion src/libpfm4/lib/pfmlib_intel_x86.c
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ pfm_intel_x86_display_reg(void *this, pfmlib_event_desc_t *e)
if (pe[e->event].modmsk & _INTEL_X86_ATTR_T)
__pfm_vbprintf(" any=%d", reg.sel_anythr);

__pfm_vbprintf("]", e->fstr);
__pfm_vbprintf("]");

for (i = 1 ; i < e->count; i++)
__pfm_vbprintf(" [0x%"PRIx64"]", e->codes[i]);
Expand Down
2 changes: 1 addition & 1 deletion src/libpfm4/lib/pfmlib_intel_x86_perf_event.c
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ pfm_intel_x86_get_perf_encoding(void *this, pfmlib_event_desc_t *e)
return ret;

if (e->count > 2) {
DPRINT("%s: unsupported count=%d\n", e->count);
DPRINT("unsupported count=%d\n", e->count);
return PFM_ERR_NOTSUPP;
}
/* default PMU type */
Expand Down

0 comments on commit 59001e2

Please sign in to comment.