Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit ac5eed2b authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull perf tooling updates form Ingo Molnar:
 "A final batch of perf tooling changes: mostly fixes and small
  improvements"

* 'perf-urgent-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (29 commits)
  perf session: Add comment for perf_session__register_idle_thread()
  perf thread-stack: Fix thread stack processing for the idle task
  perf thread-stack: Allocate an array of thread stacks
  perf thread-stack: Factor out thread_stack__init()
  perf thread-stack: Allow for a thread stack array
  perf thread-stack: Avoid direct reference to the thread's stack
  perf thread-stack: Tidy thread_stack__bottom() usage
  perf thread-stack: Simplify some code in thread_stack__process()
  tools gpio: Allow overriding CFLAGS
  tools power turbostat: Override CFLAGS assignments and add LDFLAGS to build command
  tools thermal tmon: Allow overriding CFLAGS assignments
  tools power x86_energy_perf_policy: Override CFLAGS assignments and add LDFLAGS to build command
  perf c2c: Increase the HITM ratio limit for displayed cachelines
  perf c2c: Change the default coalesce setup
  perf trace beauty ioctl: Beautify USBDEVFS_ commands
  perf trace beauty: Export function to get the files for a thread
  perf trace: Wire up ioctl's USBDEBFS_ cmd table generator
  perf beauty ioctl: Add generator for USBDEVFS_ ioctl commands
  tools headers uapi: Grab a copy of usbdevice_fs.h
  perf trace: Store the major number for a file when storing its pathname
  ...
parents 574823bf 2573be22

tools/build/Makefile.feature

+2 −2
Original line number Diff line number Diff line
@@ -82,8 +82,8 @@ FEATURE_TESTS_EXTRA := \ 
         cplus-demangle                 \

         hello                          \

         libbabeltrace                  \

         liberty                        \

         liberty-z                      \

         libbfd-liberty                 \

         libbfd-liberty-z               \

         libunwind-debug-frame          \

         libunwind-debug-frame-arm      \

         libunwind-debug-frame-aarch64  \

tools/build/feature/Makefile

+5 −5
Original line number Diff line number Diff line
@@ -17,8 +17,8 @@ FILES= \ 
         test-libbfd.bin                        \

         test-disassembler-four-args.bin        \

         test-reallocarray.bin			\

         test-liberty.bin                       \

         test-liberty-z.bin                     \

         test-libbfd-liberty.bin                \

         test-libbfd-liberty-z.bin              \

         test-cplus-demangle.bin                \

         test-libelf.bin                        \

         test-libelf-getphdrnum.bin             \
@@ -210,7 +210,7 @@ $(OUTPUT)test-libpython-version.bin: 
	$(BUILD)



$(OUTPUT)test-libbfd.bin:

	$(BUILD) -DPACKAGE='"perf"' -lbfd -lz -liberty -ldl

	$(BUILD) -DPACKAGE='"perf"' -lbfd -ldl



$(OUTPUT)test-disassembler-four-args.bin:

	$(BUILD) -DPACKAGE='"perf"' -lbfd -lopcodes
@@ -218,10 +218,10 @@ $(OUTPUT)test-disassembler-four-args.bin: 
$(OUTPUT)test-reallocarray.bin:

	$(BUILD)



$(OUTPUT)test-liberty.bin:

$(OUTPUT)test-libbfd-liberty.bin:

	$(CC) $(CFLAGS) -Wall -Werror -o $@ test-libbfd.c -DPACKAGE='"perf"' $(LDFLAGS) -lbfd -ldl -liberty



$(OUTPUT)test-liberty-z.bin:

$(OUTPUT)test-libbfd-liberty-z.bin:

	$(CC) $(CFLAGS) -Wall -Werror -o $@ test-libbfd.c -DPACKAGE='"perf"' $(LDFLAGS) -lbfd -ldl -liberty -lz



$(OUTPUT)test-cplus-demangle.bin:

tools/gpio/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ endif 
# (this improves performance and avoids hard-to-debug behaviour);

MAKEFLAGS += -r



CFLAGS += -O2 -Wall -g -D_GNU_SOURCE -I$(OUTPUT)include

override CFLAGS += -O2 -Wall -g -D_GNU_SOURCE -I$(OUTPUT)include



ALL_TARGETS := lsgpio gpio-hammer gpio-event-mon

ALL_PROGRAMS := $(patsubst %,$(OUTPUT)%,$(ALL_TARGETS))

tools/include/uapi/linux/usbdevice_fs.h

0 → 100644
+201 −0
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0+ WITH Linux-syscall-note */

/*****************************************************************************/



/*

 *	usbdevice_fs.h  --  USB device file system.

 *

 *	Copyright (C) 2000

 *          Thomas Sailer (sailer@ife.ee.ethz.ch)

 *

 *	This program is free software; you can redistribute it and/or modify

 *	it under the terms of the GNU General Public License as published by

 *	the Free Software Foundation; either version 2 of the License, or

 *	(at your option) any later version.

 *

 *	This program is distributed in the hope that it will be useful,

 *	but WITHOUT ANY WARRANTY; without even the implied warranty of

 *	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 *	GNU General Public License for more details.

 *

 *	You should have received a copy of the GNU General Public License

 *	along with this program; if not, write to the Free Software

 *	Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.

 *

 *  History:

 *   0.1  04.01.2000  Created

 */



/*****************************************************************************/



#ifndef _UAPI_LINUX_USBDEVICE_FS_H

#define _UAPI_LINUX_USBDEVICE_FS_H



#include <linux/types.h>

#include <linux/magic.h>



/* --------------------------------------------------------------------- */



/* usbdevfs ioctl codes */



struct usbdevfs_ctrltransfer {

	__u8 bRequestType;

	__u8 bRequest;

	__u16 wValue;

	__u16 wIndex;

	__u16 wLength;

	__u32 timeout;  /* in milliseconds */

 	void __user *data;

};



struct usbdevfs_bulktransfer {

	unsigned int ep;

	unsigned int len;

	unsigned int timeout; /* in milliseconds */

	void __user *data;

};



struct usbdevfs_setinterface {

	unsigned int interface;

	unsigned int altsetting;

};



struct usbdevfs_disconnectsignal {

	unsigned int signr;

	void __user *context;

};



#define USBDEVFS_MAXDRIVERNAME 255



struct usbdevfs_getdriver {

	unsigned int interface;

	char driver[USBDEVFS_MAXDRIVERNAME + 1];

};



struct usbdevfs_connectinfo {

	unsigned int devnum;

	unsigned char slow;

};



#define USBDEVFS_URB_SHORT_NOT_OK	0x01

#define USBDEVFS_URB_ISO_ASAP		0x02

#define USBDEVFS_URB_BULK_CONTINUATION	0x04

#define USBDEVFS_URB_NO_FSBR		0x20	/* Not used */

#define USBDEVFS_URB_ZERO_PACKET	0x40

#define USBDEVFS_URB_NO_INTERRUPT	0x80



#define USBDEVFS_URB_TYPE_ISO		   0

#define USBDEVFS_URB_TYPE_INTERRUPT	   1

#define USBDEVFS_URB_TYPE_CONTROL	   2

#define USBDEVFS_URB_TYPE_BULK		   3



struct usbdevfs_iso_packet_desc {

	unsigned int length;

	unsigned int actual_length;

	unsigned int status;

};



struct usbdevfs_urb {

	unsigned char type;

	unsigned char endpoint;

	int status;

	unsigned int flags;

	void __user *buffer;

	int buffer_length;

	int actual_length;

	int start_frame;

	union {

		int number_of_packets;	/* Only used for isoc urbs */

		unsigned int stream_id;	/* Only used with bulk streams */

	};

	int error_count;

	unsigned int signr;	/* signal to be sent on completion,

				  or 0 if none should be sent. */

	void __user *usercontext;

	struct usbdevfs_iso_packet_desc iso_frame_desc[0];

};



/* ioctls for talking directly to drivers */

struct usbdevfs_ioctl {

	int	ifno;		/* interface 0..N ; negative numbers reserved */

	int	ioctl_code;	/* MUST encode size + direction of data so the

				 * macros in <asm/ioctl.h> give correct values */

	void __user *data;	/* param buffer (in, or out) */

};



/* You can do most things with hubs just through control messages,

 * except find out what device connects to what port. */

struct usbdevfs_hub_portinfo {

	char nports;		/* number of downstream ports in this hub */

	char port [127];	/* e.g. port 3 connects to device 27 */

};



/* System and bus capability flags */

#define USBDEVFS_CAP_ZERO_PACKET		0x01

#define USBDEVFS_CAP_BULK_CONTINUATION		0x02

#define USBDEVFS_CAP_NO_PACKET_SIZE_LIM		0x04

#define USBDEVFS_CAP_BULK_SCATTER_GATHER	0x08

#define USBDEVFS_CAP_REAP_AFTER_DISCONNECT	0x10

#define USBDEVFS_CAP_MMAP			0x20

#define USBDEVFS_CAP_DROP_PRIVILEGES		0x40



/* USBDEVFS_DISCONNECT_CLAIM flags & struct */



/* disconnect-and-claim if the driver matches the driver field */

#define USBDEVFS_DISCONNECT_CLAIM_IF_DRIVER	0x01

/* disconnect-and-claim except when the driver matches the driver field */

#define USBDEVFS_DISCONNECT_CLAIM_EXCEPT_DRIVER	0x02



struct usbdevfs_disconnect_claim {

	unsigned int interface;

	unsigned int flags;

	char driver[USBDEVFS_MAXDRIVERNAME + 1];

};



struct usbdevfs_streams {

	unsigned int num_streams; /* Not used by USBDEVFS_FREE_STREAMS */

	unsigned int num_eps;

	unsigned char eps[0];

};



/*

 * USB_SPEED_* values returned by USBDEVFS_GET_SPEED are defined in

 * linux/usb/ch9.h

 */



#define USBDEVFS_CONTROL           _IOWR('U', 0, struct usbdevfs_ctrltransfer)

#define USBDEVFS_CONTROL32           _IOWR('U', 0, struct usbdevfs_ctrltransfer32)

#define USBDEVFS_BULK              _IOWR('U', 2, struct usbdevfs_bulktransfer)

#define USBDEVFS_BULK32              _IOWR('U', 2, struct usbdevfs_bulktransfer32)

#define USBDEVFS_RESETEP           _IOR('U', 3, unsigned int)

#define USBDEVFS_SETINTERFACE      _IOR('U', 4, struct usbdevfs_setinterface)

#define USBDEVFS_SETCONFIGURATION  _IOR('U', 5, unsigned int)

#define USBDEVFS_GETDRIVER         _IOW('U', 8, struct usbdevfs_getdriver)

#define USBDEVFS_SUBMITURB         _IOR('U', 10, struct usbdevfs_urb)

#define USBDEVFS_SUBMITURB32       _IOR('U', 10, struct usbdevfs_urb32)

#define USBDEVFS_DISCARDURB        _IO('U', 11)

#define USBDEVFS_REAPURB           _IOW('U', 12, void *)

#define USBDEVFS_REAPURB32         _IOW('U', 12, __u32)

#define USBDEVFS_REAPURBNDELAY     _IOW('U', 13, void *)

#define USBDEVFS_REAPURBNDELAY32   _IOW('U', 13, __u32)

#define USBDEVFS_DISCSIGNAL        _IOR('U', 14, struct usbdevfs_disconnectsignal)

#define USBDEVFS_DISCSIGNAL32      _IOR('U', 14, struct usbdevfs_disconnectsignal32)

#define USBDEVFS_CLAIMINTERFACE    _IOR('U', 15, unsigned int)

#define USBDEVFS_RELEASEINTERFACE  _IOR('U', 16, unsigned int)

#define USBDEVFS_CONNECTINFO       _IOW('U', 17, struct usbdevfs_connectinfo)

#define USBDEVFS_IOCTL             _IOWR('U', 18, struct usbdevfs_ioctl)

#define USBDEVFS_IOCTL32           _IOWR('U', 18, struct usbdevfs_ioctl32)

#define USBDEVFS_HUB_PORTINFO      _IOR('U', 19, struct usbdevfs_hub_portinfo)

#define USBDEVFS_RESET             _IO('U', 20)

#define USBDEVFS_CLEAR_HALT        _IOR('U', 21, unsigned int)

#define USBDEVFS_DISCONNECT        _IO('U', 22)

#define USBDEVFS_CONNECT           _IO('U', 23)

#define USBDEVFS_CLAIM_PORT        _IOR('U', 24, unsigned int)

#define USBDEVFS_RELEASE_PORT      _IOR('U', 25, unsigned int)

#define USBDEVFS_GET_CAPABILITIES  _IOR('U', 26, __u32)

#define USBDEVFS_DISCONNECT_CLAIM  _IOR('U', 27, struct usbdevfs_disconnect_claim)

#define USBDEVFS_ALLOC_STREAMS     _IOR('U', 28, struct usbdevfs_streams)

#define USBDEVFS_FREE_STREAMS      _IOR('U', 29, struct usbdevfs_streams)

#define USBDEVFS_DROP_PRIVILEGES   _IOW('U', 30, __u32)

#define USBDEVFS_GET_SPEED         _IO('U', 31)



#endif /* _UAPI_LINUX_USBDEVICE_FS_H */

tools/perf/Makefile.config

+23 −21
Original line number Diff line number Diff line
@@ -702,18 +702,20 @@ endif 


ifeq ($(feature-libbfd), 1)

  EXTLIBS += -lbfd

else

  # we are on a system that requires -liberty and (maybe) -lz

  # to link against -lbfd; test each case individually here



  # call all detections now so we get correct

  # status in VF output

  $(call feature_check,liberty)

  $(call feature_check,liberty-z)

  $(call feature_check,cplus-demangle)

  $(call feature_check,libbfd-liberty)

  $(call feature_check,libbfd-liberty-z)



  ifeq ($(feature-liberty), 1)

    EXTLIBS += -liberty

  ifeq ($(feature-libbfd-liberty), 1)

    EXTLIBS += -lbfd -liberty

  else

    ifeq ($(feature-liberty-z), 1)

      EXTLIBS += -liberty -lz

    ifeq ($(feature-libbfd-liberty-z), 1)

      EXTLIBS += -lbfd -liberty -lz

    endif

  endif

endif
@@ -723,23 +725,23 @@ ifdef NO_DEMANGLE 
else

  ifdef HAVE_CPLUS_DEMANGLE_SUPPORT

    EXTLIBS += -liberty

    CFLAGS += -DHAVE_CPLUS_DEMANGLE_SUPPORT

  else

    ifneq ($(feature-libbfd), 1)

      ifneq ($(feature-liberty), 1)

        ifneq ($(feature-liberty-z), 1)

    ifeq ($(filter -liberty,$(EXTLIBS)),)

      $(call feature_check,cplus-demangle)



      # we dont have neither HAVE_CPLUS_DEMANGLE_SUPPORT

      # or any of 'bfd iberty z' trinity

      ifeq ($(feature-cplus-demangle), 1)

        EXTLIBS += -liberty

            CFLAGS += -DHAVE_CPLUS_DEMANGLE_SUPPORT

      else

        msg := $(warning No bfd.h/libbfd found, please install binutils-dev[el]/zlib-static/libiberty-dev to gain symbol demangling)

        CFLAGS += -DNO_DEMANGLE

      endif

    endif

  endif

    endif



  ifneq ($(filter -liberty,$(EXTLIBS)),)

    CFLAGS += -DHAVE_CPLUS_DEMANGLE_SUPPORT

  endif

endif