Commit 913ec3c2 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'perf-tools-fixes-for-v5.13-2021-06-19' of... 

Merge tag 'perf-tools-fixes-for-v5.13-2021-06-19' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux

Pull perf tools fixes from Arnaldo Carvalho de Melo:

 - Fix refcount usage when processing PERF_RECORD_KSYMBOL.

 - 'perf stat' metric group fixes.

 - Fix 'perf test' non-bash issue with stat bpf counters.

 - Update unistd, in.h and socket.h with the kernel sources, silencing
   perf build warnings.

* tag 'perf-tools-fixes-for-v5.13-2021-06-19' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux:
  tools headers UAPI: Sync linux/in.h copy with the kernel sources
  tools headers UAPI: Sync asm-generic/unistd.h with the kernel original
  perf beauty: Update copy of linux/socket.h with the kernel sources
  perf test: Fix non-bash issue with stat bpf counters
  perf machine: Fix refcount usage when processing PERF_RECORD_KSYMBOL
  perf metricgroup: Return error code from metricgroup__add_metric_sys_event_iter()
  perf metricgroup: Fix find_evsel_group() event selector
parents d9403d30 1792a59e

tools/include/uapi/asm-generic/unistd.h

+1 −2
Original line number Diff line number Diff line
@@ -863,8 +863,7 @@ __SYSCALL(__NR_process_madvise, sys_process_madvise) 
__SC_COMP(__NR_epoll_pwait2, sys_epoll_pwait2, compat_sys_epoll_pwait2)

#define __NR_mount_setattr 442

__SYSCALL(__NR_mount_setattr, sys_mount_setattr)

#define __NR_quotactl_path 443

__SYSCALL(__NR_quotactl_path, sys_quotactl_path)

/* 443 is reserved for quotactl_path */



#define __NR_landlock_create_ruleset 444

__SYSCALL(__NR_landlock_create_ruleset, sys_landlock_create_ruleset)

tools/include/uapi/linux/in.h

+3 −0
Original line number Diff line number Diff line
@@ -289,6 +289,9 @@ struct sockaddr_in { 
/* Address indicating an error return. */

#define	INADDR_NONE		((unsigned long int) 0xffffffff)



/* Dummy address for src of ICMP replies if no real address is set (RFC7600). */

#define	INADDR_DUMMY		((unsigned long int) 0xc0000008)



/* Network number for local host loopback. */

#define	IN_LOOPBACKNET		127

tools/perf/tests/shell/stat_bpf_counters.sh

+2 −2
Original line number Diff line number Diff line
@@ -11,9 +11,9 @@ compare_number() 
       second_num=$2



       # upper bound is first_num * 110%

       upper=$(( $first_num + $first_num / 10 ))

       upper=$(expr $first_num + $first_num / 10 )

       # lower bound is first_num * 90%

       lower=$(( $first_num - $first_num / 10 ))

       lower=$(expr $first_num - $first_num / 10 )



       if [ $second_num -gt $upper ] || [ $second_num -lt $lower ]; then

               echo "The difference between $first_num and $second_num are greater than 10%."

tools/perf/trace/beauty/include/linux/socket.h

+0 −2
Original line number Diff line number Diff line
@@ -438,6 +438,4 @@ extern int __sys_socketpair(int family, int type, int protocol, 
			    int __user *usockvec);

extern int __sys_shutdown_sock(struct socket *sock, int how);

extern int __sys_shutdown(int fd, int how);



extern struct ns_common *get_net_ns(struct ns_common *ns);

#endif /* _LINUX_SOCKET_H */

tools/perf/util/machine.c

+2 −1
Original line number Diff line number Diff line
@@ -776,10 +776,10 @@ static int machine__process_ksymbol_register(struct machine *machine, 
		if (dso) {

			dso->kernel = DSO_SPACE__KERNEL;

			map = map__new2(0, dso);

			dso__put(dso);

		}



		if (!dso || !map) {

			dso__put(dso);

			return -ENOMEM;

		}
@@ -792,6 +792,7 @@ static int machine__process_ksymbol_register(struct machine *machine, 
		map->start = event->ksymbol.addr;

		map->end = map->start + event->ksymbol.len;

		maps__insert(&machine->kmaps, map);

		map__put(map);

		dso__set_loaded(dso);



		if (is_bpf_image(event->ksymbol.name)) {