Skip to contentSkip to conversation

clk: trace: Trace range functions

PATCH Superseded Maxime Ripard 2 participants 2 messages Dec 3, 2020

Subsystems (2)

v1 of 2 Superseded Latest is v2 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 clk: trace: Trace range functions

The clk_set_range functions don't have any tracepoints even though it might be useful. Fix this.

---
 drivers/clk/clk.c          |  6 ++++++
 include/trace/events/clk.h | 44 ++++++++++++++++++++++++++++++++++++++
 2 files changed, 50 insertions(+)
drivers/clk/clk.c +6 -0
index f83dac54ed85..34c2fa18b732 100644
@@ -2314,6 +2314,8 @@ int clk_set_rate_range(struct clk *clk, unsigned long min, unsigned long max)
 	if (!clk)
 		return 0;
 
+	trace_clk_set_rate_range(clk->core, min, max);
+
 	if (min > max) {
 		pr_err("%s: clk %s dev %s con %s: invalid range [%lu, %lu]\n",
 		       __func__, clk->core->name, clk->dev_id, clk->con_id,
@@ -2378,6 +2380,8 @@ EXPORT_SYMBOL_GPL(clk_set_rate_range);
  */
 int clk_set_min_rate(struct clk *clk, unsigned long rate)
 {
+	trace_clk_set_min_rate(clk->core, rate);
+
 	if (!clk)
 		return 0;
 
@@ -2394,6 +2398,8 @@ EXPORT_SYMBOL_GPL(clk_set_min_rate);
  */
 int clk_set_max_rate(struct clk *clk, unsigned long rate)
 {
+	trace_clk_set_max_rate(clk->core, rate);
+
 	if (!clk)
 		return 0;
 
include/trace/events/clk.h +44 -0

50 lines not on this page · raw message

Signature · 1 line
2.28.0
#1 lore raw

Hi Maxime,

url:    https://github.com/0day-ci/linux/commits/Maxime-Ripard/clk-trace-Trace-range-functions/20201203-160811 
base:   https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git  clk-next
config: x86_64-randconfig-m001-20201203 (attached as .config)
compiler: gcc-9 (Debian 9.3.0-15) 9.3.0

If you fix the issue, kindly add following tag as appropriate

New smatch warnings:
drivers/clk/clk.c:2385 clk_set_min_rate() warn: variable dereferenced before check 'clk' (see line 2383) drivers/clk/clk.c:2403 clk_set_max_rate() warn: variable dereferenced before check 'clk' (see line 2401)

Old smatch warnings:
drivers/clk/clk.c:3657 clk_hw_create_clk() warn: passing zero to 'ERR_CAST'

vim +/clk +2385 drivers/clk/clk.c

4dff95dc9477a34 Stephen Boyd  2015-04-30  2381  int clk_set_min_rate(struct clk *clk, unsigned long rate)
035a61c314eb3da Tomeu Vizoso  2015-01-23  2382  {
1e0141250281741 Maxime Ripard 2020-12-03 @2383  	trace_clk_set_min_rate(clk->core, rate);
                                                                               ^^^^^^^^^

Dereference

1e0141250281741 Maxime Ripard 2020-12-03 2384
035a61c314eb3da Tomeu Vizoso 2015-01-23 @2385 if (!clk)

                                                            ^^^^

Checked too late

035a61c314eb3da Tomeu Vizoso  2015-01-23  2386  		return 0;
035a61c314eb3da Tomeu Vizoso  2015-01-23  2387  
4dff95dc9477a34 Stephen Boyd  2015-04-30  2388  	return clk_set_rate_range(clk, rate, clk->max_rate);
035a61c314eb3da Tomeu Vizoso  2015-01-23  2389  }
4dff95dc9477a34 Stephen Boyd  2015-04-30  2390  EXPORT_SYMBOL_GPL(clk_set_min_rate);
a093bde2b45a0a7 Ulf Hansson   2012-08-31  2391  
4dff95dc9477a34 Stephen Boyd  2015-04-30  2392  /**
4dff95dc9477a34 Stephen Boyd  2015-04-30  2393   * clk_set_max_rate - set a maximum clock rate for a clock source
4dff95dc9477a34 Stephen Boyd  2015-04-30  2394   * @clk: clock source
4dff95dc9477a34 Stephen Boyd  2015-04-30  2395   * @rate: desired maximum clock rate in Hz, inclusive
4dff95dc9477a34 Stephen Boyd  2015-04-30  2396   *
4dff95dc9477a34 Stephen Boyd  2015-04-30  2397   * Returns success (0) or negative errno.
4dff95dc9477a34 Stephen Boyd  2015-04-30  2398   */
4dff95dc9477a34 Stephen Boyd  2015-04-30  2399  int clk_set_max_rate(struct clk *clk, unsigned long rate)
4935b22c46ea5e2 James Hogan   2013-07-29  2400  {
1e0141250281741 Maxime Ripard 2020-12-03 @2401  	trace_clk_set_max_rate(clk->core, rate);
                                                                               ^^^^^^^^^

1e0141250281741 Maxime Ripard 2020-12-03 2402
4dff95dc9477a34 Stephen Boyd 2015-04-30 @2403 if (!clk)

                                                            ^^^^
4dff95dc9477a34 Stephen Boyd  2015-04-30  2404  		return 0;
4935b22c46ea5e2 James Hogan   2013-07-29  2405  
4dff95dc9477a34 Stephen Boyd  2015-04-30  2406  	return clk_set_rate_range(clk, clk->min_rate, rate);
f1c8b2edf916b5b Tomasz Figa   2013-09-29  2407  }

---
0-DAY CI Kernel Test Service, Intel Corporation
https://lists.01.org/hyperkitty/list/kbuild-all(a)lists.01.org

_______________________________________________
kbuild mailing list -- kbuild(a)lists.01.org
To unsubscribe send an email to kbuild-leave(a)lists.01.org

rm -fr include/generated/ arch/x86/include/generated/
cp .config-bisect .config
.config:390:warning: override: LEGACY_VSYSCALL_XONLY changes choice state
3 real 1 user 0 sys 44.38% cpu make olddefconfig
/usr/bin/timeout -k 100 3h /usr/bin/make W=1 --keep-going HOSTCC=gcc-9 CC=gcc-9 -j32 -C source O=/kbuild/obj/smatch/x86_64-randconfig-m001-20201203 ARCH=x86_64 olddefconfig
make: Entering directory '/kbuild/src/smatch'
make[1]: Entering directory '/kbuild/obj/smatch/x86_64-randconfig-m001-20201203'
GEN Makefile
#

# configuration written to .config
#
make[1]: Leaving directory '/kbuild/obj/smatch/x86_64-randconfig-m001-20201203'
make: Leaving directory '/kbuild/src/smatch'
cp .config /tmp/kernel/x86_64-randconfig-m001-20201203/gcc-9/1e0141250281741cd812d97408491bfc49262d3e/
/usr/bin/timeout -k 100 2h /usr/bin/make W=1 --keep-going HOSTCC=gcc-9 CC=gcc-9 -j32 -C source O=/kbuild/obj/smatch/x86_64-randconfig-m001-20201203 ARCH=x86_64 prepare
make: Entering directory '/kbuild/src/smatch'
make[1]: Entering directory '/kbuild/obj/smatch/x86_64-randconfig-m001-20201203'
  SYNC    include/config/auto.conf.cmd
  GEN     Makefile
  GEN     Makefile
  SYSTBL  arch/x86/include/generated/asm/syscalls_32.h
  SYSHDR  arch/x86/include/generated/asm/unistd_32_ia32.h
  SYSHDR  arch/x86/include/generated/asm/unistd_64_x32.h
  SYSTBL  arch/x86/include/generated/asm/syscalls_64.h
  SYSHDR  arch/x86/include/generated/uapi/asm/unistd_32.h
  SYSHDR  arch/x86/include/generated/uapi/asm/unistd_64.h
  SYSHDR  arch/x86/include/generated/uapi/asm/unistd_x32.h
  WRAP    arch/x86/include/generated/uapi/asm/bpf_perf_event.h
  WRAP    arch/x86/include/generated/uapi/asm/errno.h
  WRAP    arch/x86/include/generated/uapi/asm/fcntl.h
  WRAP    arch/x86/include/generated/uapi/asm/ioctl.h
  WRAP    arch/x86/include/generated/uapi/asm/ioctls.h
  WRAP    arch/x86/include/generated/uapi/asm/ipcbuf.h
  WRAP    arch/x86/include/generated/uapi/asm/param.h
  WRAP    arch/x86/include/generated/uapi/asm/poll.h
  WRAP    arch/x86/include/generated/uapi/asm/resource.h
  WRAP    arch/x86/include/generated/uapi/asm/socket.h
  WRAP    arch/x86/include/generated/uapi/asm/sockios.h
  WRAP    arch/x86/include/generated/uapi/asm/termbits.h
  WRAP    arch/x86/include/generated/uapi/asm/termios.h
  WRAP    arch/x86/include/generated/uapi/asm/types.h
  WRAP    arch/x86/include/generated/asm/early_ioremap.h
  WRAP    arch/x86/include/generated/asm/export.h
  WRAP    arch/x86/include/generated/asm/mcs_spinlock.h
  WRAP    arch/x86/include/generated/asm/irq_regs.h
  WRAP    arch/x86/include/generated/asm/mm-arch-hooks.h
  WRAP    arch/x86/include/generated/asm/mmiowb.h
  WRAP    arch/x86/include/generated/asm/module.lds.h
  WRAP    arch/x86/include/generated/asm/rwonce.h
  UPD     include/generated/uapi/linux/version.h
  DESCEND  objtool
  HDRINST usr/include/linux/version.h
  HDRINST usr/include/asm/poll.h
  HDRINST usr/include/asm/unistd_32.h
  HDRINST usr/include/asm/socket.h
  HDRINST usr/include/asm/sockios.h
  HDRINST usr/include/asm/unistd_64.h
  HDRINST usr/include/asm/ipcbuf.h
  HDRINST usr/include/asm/errno.h
  HDRINST usr/include/asm/unistd_x32.h
  HDRINST usr/include/asm/ioctls.h
  HDRINST usr/include/asm/resource.h
  HDRINST usr/include/asm/fcntl.h
  HDRINST usr/include/asm/bpf_perf_event.h
  HDRINST usr/include/asm/types.h
  HDRINST usr/include/asm/param.h
  HDRINST usr/include/asm/ioctl.h
  HDRINST usr/include/asm/termbits.h
  HDRINST usr/include/asm/termios.h
  UPD     include/config/kernel.release
  UPD     include/generated/utsrelease.h
  CC      scripts/mod/devicetable-offsets.s
  CC      kernel/bounds.s
  CALL    /kbuild/src/smatch/scripts/atomic/check-atomics.sh
  UPD     include/generated/timeconst.h
  UPD     include/generated/bounds.h
  CC      arch/x86/kernel/asm-offsets.s
  UPD     include/generated/asm-offsets.h
  CALL    /kbuild/src/smatch/scripts/checksyscalls.sh
make[1]: Leaving directory '/kbuild/obj/smatch/x86_64-randconfig-m001-20201203'
make: Leaving directory '/kbuild/src/smatch'
21 real  7 user  8 sys  76.51% cpu 	make prepare
/usr/bin/timeout -k 100 2h /usr/bin/make W=1 --keep-going HOSTCC=gcc-9 CC=gcc-9 -j32 -C source O=/kbuild/obj/smatch/x86_64-randconfig-m001-20201203 ARCH=x86_64 modules_prepare
make: Entering directory '/kbuild/src/smatch'
make[1]: Entering directory '/kbuild/obj/smatch/x86_64-randconfig-m001-20201203'
  GEN     Makefile
  DESCEND  objtool
  CALL    /kbuild/src/smatch/scripts/atomic/check-atomics.sh
  CALL    /kbuild/src/smatch/scripts/checksyscalls.sh
  LDS     scripts/module.lds
make[1]: Leaving directory '/kbuild/obj/smatch/x86_64-randconfig-m001-20201203'
make: Leaving directory '/kbuild/src/smatch'
12 real  3 user  6 sys  82.10% cpu 	make modules_prepare
/usr/bin/timeout -k 100 3h /usr/bin/make W=1 --keep-going HOSTCC=gcc-9 CC=gcc-9 -j32 -C source O=/kbuild/obj/smatch/x86_64-randconfig-m001-20201203 ARCH=x86_64 INSTALL_HDR_PATH=/tmp/usr/src/linux-headers-x86_64-randconfig-m001-20201203-1e0141250281741cd812d97408491bfc49262d3e headers_install
make: Entering directory '/kbuild/src/smatch'
make[1]: Entering directory '/kbuild/obj/smatch/x86_64-randconfig-m001-20201203'
  INSTALL /tmp/usr/src/linux-headers-x86_64-randconfig-m001-20201203-1e0141250281741cd812d97408491bfc49262d3e/include
make[1]: Leaving directory '/kbuild/obj/smatch/x86_64-randconfig-m001-20201203'
make: Leaving directory '/kbuild/src/smatch'
3 real  0 user  0 sys  36.48% cpu 	make INSTALL_HDR_PATH=/tmp/usr/src/linux-headers-x86_64-randconfig-m001-20201203-1e0141250281741cd812d97408491bfc49262d3e headers_install
setup_smatchdb: enter
setup_smatch: C=1
PATH=/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
/usr/bin/timeout -k 100 12h /usr/bin/make C=1 CHECK=/c/kernel-tests/smatch W=1 --keep-going HOSTCC=gcc-9 CC=gcc-9 -j32 -C source O=/kbuild/obj/smatch/x86_64-randconfig-m001-20201203 ARCH=x86_64 SHELL=/bin/bash drivers/clk/
make: Entering directory '/kbuild/src/smatch'
make[1]: Entering directory '/kbuild/obj/smatch/x86_64-randconfig-m001-20201203'
  GEN     Makefile
  DESCEND  objtool
  CALL    /kbuild/src/smatch/scripts/atomic/check-atomics.sh
  CALL    /kbuild/src/smatch/scripts/checksyscalls.sh
  CC      drivers/clk/clk-devres.o
  CC      drivers/clk/clk-bulk.o
  CC      drivers/clk/clkdev.o
  CC      drivers/clk/clk.o
  CC      drivers/clk/clk-divider.o
  CC      drivers/clk/clk-fixed-factor.o
  CC      drivers/clk/x86/clk-pmc-atom.o
  CC      drivers/clk/clk-fixed-rate.o
  CC      drivers/clk/x86/clk-cgu.o
  CC      drivers/clk/x86/clk-cgu-pll.o
  CC      drivers/clk/clk-gate.o
  CC      drivers/clk/x86/clk-lgm.o
  CC      drivers/clk/clk-multiplier.o
  CC      drivers/clk/clk-mux.o
  CC      drivers/clk/clk-composite.o
  CC      drivers/clk/clk-fractional-divider.o
  CC      drivers/clk/clk-gpio.o
  CC      drivers/clk/clk-conf.o
  CC      drivers/clk/clk-bd718x7.o
  CC      drivers/clk/clk-cdce706.o
  CC      drivers/clk/clk-cdce925.o
  CC      drivers/clk/clk-fixed-mmio.o
  CC      drivers/clk/clk-lochnagar.o
  CC      drivers/clk/clk-cs2000-cp.o
  CC      drivers/clk/clk-max9485.o
  CC      drivers/clk/clk-si5341.o
  CC      drivers/clk/clk-si544.o
  CC      drivers/clk/clk-si570.o
  CC      drivers/clk/clk-twl6040.o
/kbuild/src/smatch/drivers/clk/clkdev.c: In function 'vclkdev_alloc':
/kbuild/src/smatch/drivers/clk/clkdev.c:173:3: warning: function 'vclkdev_alloc' might be a candidate for 'gnu_printf' format attribute [-Wsuggest-attribute=format]
  173 |   vscnprintf(cla->dev_id, sizeof(cla->dev_id), dev_fmt, ap);
      |   ^~~~~~~~~~
  CHECK   /kbuild/src/smatch/drivers/clk/clk-lochnagar.c
  CHECK   /kbuild/src/smatch/drivers/clk/clk-devres.c
  CHECK   /kbuild/src/smatch/drivers/clk/x86/clk-lgm.c
  CHECK   /kbuild/src/smatch/drivers/clk/clk-gpio.c
  CHECK   /kbuild/src/smatch/drivers/clk/x86/clk-cgu-pll.c
  CHECK   /kbuild/src/smatch/drivers/clk/clk-gate.c
  CHECK   /kbuild/src/smatch/drivers/clk/clk-mux.c
  CHECK   /kbuild/src/smatch/drivers/clk/x86/clk-pmc-atom.c
  CHECK   /kbuild/src/smatch/drivers/clk/clk-conf.c
  CHECK   /kbuild/src/smatch/drivers/clk/clk-divider.c
  CHECK   /kbuild/src/smatch/drivers/clk/clk-fixed-mmio.c
  CHECK   /kbuild/src/smatch/drivers/clk/clk-bulk.c
  CHECK   /kbuild/src/smatch/drivers/clk/clk-fixed-factor.c
  CHECK   /kbuild/src/smatch/drivers/clk/clk-multiplier.c
  CHECK   /kbuild/src/smatch/drivers/clk/clk-si544.c
  CHECK   /kbuild/src/smatch/drivers/clk/clk-cdce706.c
  CHECK   /kbuild/src/smatch/drivers/clk/clk-fixed-rate.c
  CHECK   /kbuild/src/smatch/drivers/clk/clk-composite.c
  CHECK   /kbuild/src/smatch/drivers/clk/clkdev.c
  CHECK   /kbuild/src/smatch/drivers/clk/clk-cs2000-cp.c
  CHECK   /kbuild/src/smatch/drivers/clk/clk-fractional-divider.c
  CHECK   /kbuild/src/smatch/drivers/clk/clk-si570.c
  CHECK   /kbuild/src/smatch/drivers/clk/clk-twl6040.c
  CHECK   /kbuild/src/smatch/drivers/clk/clk-bd718x7.c
  CHECK   /kbuild/src/smatch/drivers/clk/clk-max9485.c
  CHECK   /kbuild/src/smatch/drivers/clk/x86/clk-cgu.c
  CHECK   /kbuild/src/smatch/drivers/clk/clk-cdce925.c
/kbuild/src/smatch/drivers/clk/clk-fixed-mmio.c:62: warning: Function parameter or member 'pdev' not described in 'of_fixed_mmio_clk_probe'
  CHECK   /kbuild/src/smatch/drivers/clk/clk-si5341.c
  AR      drivers/clk/x86/built-in.a
  CHECK   /kbuild/src/smatch/drivers/clk/clk.c
  AR      drivers/clk/built-in.a
make[1]: Leaving directory '/kbuild/obj/smatch/x86_64-randconfig-m001-20201203'
make: Leaving directory '/kbuild/src/smatch'
35 real  58 user  18 sys  217.93% cpu 	make SHELL=/bin/bash drivers/clk/
/usr/bin/timeout -k 100 3h /usr/bin/make W=1 --keep-going HOSTCC=gcc-9 CC=gcc-9 -j32 -C source O=/kbuild/obj/smatch/x86_64-randconfig-m001-20201203 ARCH=x86_64 SHELL=/bin/bash M=drivers/clk
make: Entering directory '/kbuild/src/smatch'
make[1]: Entering directory '/kbuild/obj/smatch/x86_64-randconfig-m001-20201203'
make[1]: Leaving directory '/kbuild/obj/smatch/x86_64-randconfig-m001-20201203'
make: Leaving directory '/kbuild/src/smatch'
4 real  1 user  0 sys  38.46% cpu 	make SHELL=/bin/bash M=drivers/clk