logo

live-bootstrap

Mirror of <https://github.com/fosslinux/live-bootstrap>

4.14.341-openela.patch (15992B)

    

  1. SPDX-FileCopyrightText: 1991-2024 kernel.org contributors
  2. SPDX-FileCopyrightText: 2023-2024 Open Enterprise Linux Association <kernel-lts@openela.org>
  4. SPDX-License-Identifier: GPL-2.0-only
  6. Patch kernel headers up to 4.14.341-openela
  8. diff --git include/crypto/if_alg.h include/crypto/if_alg.h
  9. index 2ea6a95ca825..f803dc8c45ad 100644
  10. --- linux-4.14.336/include/crypto/if_alg.h
  11. +++ linux-4.14.336/include/crypto/if_alg.h
  12. @@ -146,6 +146,7 @@ struct af_alg_async_req {
  13.   * @enc:		Cryptographic operation to be performed when
  14.   *			recvmsg is invoked.
  15.   * @len:		Length of memory allocated for this data structure.
  16. + * @inflight:		Non-zero when AIO requests are in flight.
  17.   */
  18.  struct af_alg_ctx {
  19.  	struct list_head tsgl_list;
  20. @@ -163,6 +164,8 @@ struct af_alg_ctx {
  21.  	bool enc;
  22.  
  23.  	unsigned int len;
  24. +
  25. +	unsigned int inflight;
  26.  };
  27.  
  28.  int af_alg_register_type(const struct af_alg_type *type);
  29. diff --git include/drm/drm_bridge.h include/drm/drm_bridge.h
  30. index 6522d4cbc9d9..bfbd38c0b609 100644
  31. --- linux-4.14.336/include/drm/drm_bridge.h
  32. +++ linux-4.14.336/include/drm/drm_bridge.h
  33. @@ -161,7 +161,7 @@ struct drm_bridge_funcs {
  34.  	 * or &drm_encoder_helper_funcs.dpms hook.
  35.  	 *
  36.  	 * The bridge must assume that the display pipe (i.e. clocks and timing
  37. -	 * singals) feeding it is no longer running when this callback is
  38. +	 * signals) feeding it is no longer running when this callback is
  39.  	 * called.
  40.  	 *
  41.  	 * The post_disable callback is optional.
  42. diff --git include/drm/drm_mipi_dsi.h include/drm/drm_mipi_dsi.h
  43. index 689f615471ab..a059f1d968b7 100644
  44. --- linux-4.14.336/include/drm/drm_mipi_dsi.h
  45. +++ linux-4.14.336/include/drm/drm_mipi_dsi.h
  46. @@ -163,6 +163,7 @@ struct mipi_dsi_device_info {
  47.   * struct mipi_dsi_device - DSI peripheral device
  48.   * @host: DSI host for this peripheral
  49.   * @dev: driver model device node for this peripheral
  50. + * @attached: the DSI device has been successfully attached
  51.   * @name: DSI peripheral chip type
  52.   * @channel: virtual channel assigned to the peripheral
  53.   * @format: pixel format for video mode
  54. @@ -172,6 +173,7 @@ struct mipi_dsi_device_info {
  55.  struct mipi_dsi_device {
  56.  	struct mipi_dsi_host *host;
  57.  	struct device dev;
  58. +	bool attached;
  59.  
  60.  	char name[DSI_DEV_NAME_SIZE];
  61.  	unsigned int channel;
  62. diff --git include/linux/bpf.h include/linux/bpf.h
  63. index 3aa05ea79ba1..0d7a61df056b 100644
  64. --- linux-4.14.336/include/linux/bpf.h
  65. +++ linux-4.14.336/include/linux/bpf.h
  66. @@ -38,7 +38,11 @@ struct bpf_map_ops {
  67.  	/* funcs called by prog_array and perf_event_array map */
  68.  	void *(*map_fd_get_ptr)(struct bpf_map *map, struct file *map_file,
  69.  				int fd);
  70. -	void (*map_fd_put_ptr)(void *ptr);
  71. +	/* If need_defer is true, the implementation should guarantee that
  72. +	 * the to-be-put element is still alive before the bpf program, which
  73. +	 * may manipulate it, exists.
  74. +	 */
  75. +	void (*map_fd_put_ptr)(struct bpf_map *map, void *ptr, bool need_defer);
  76.  	u32 (*map_gen_lookup)(struct bpf_map *map, struct bpf_insn *insn_buf);
  77.  	u32 (*map_fd_sys_lookup_elem)(void *ptr);
  78.  };
  79. diff --git include/linux/device.h include/linux/device.h
  80. index 65e06a066b67..27b70b810463 100644
  81. --- linux-4.14.336/include/linux/device.h
  82. +++ linux-4.14.336/include/linux/device.h
  83. @@ -1474,6 +1474,9 @@ do {									\
  84.  	WARN_ONCE(condition, "%s %s: " format, \
  85.  			dev_driver_string(dev), dev_name(dev), ## arg)
  86.  
  87. +extern __printf(3, 4)
  88. +int dev_err_probe(const struct device *dev, int err, const char *fmt, ...);
  89. +
  90.  /* Create alias, so I can be autoloaded. */
  91.  #define MODULE_ALIAS_CHARDEV(major,minor) \
  92.  	MODULE_ALIAS("char-major-" __stringify(major) "-" __stringify(minor))
  93. diff --git include/linux/dmaengine.h include/linux/dmaengine.h
  94. index 8089e28539f1..d5a7d320e05c 100644
  95. --- linux-4.14.336/include/linux/dmaengine.h
  96. +++ linux-4.14.336/include/linux/dmaengine.h
  97. @@ -816,7 +816,8 @@ static inline int dmaengine_slave_config(struct dma_chan *chan,
  98.  
  99.  static inline bool is_slave_direction(enum dma_transfer_direction direction)
  100.  {
  101. -	return (direction == DMA_MEM_TO_DEV) || (direction == DMA_DEV_TO_MEM);
  102. +	return (direction == DMA_MEM_TO_DEV) || (direction == DMA_DEV_TO_MEM) ||
  103. +	       (direction == DMA_DEV_TO_DEV);
  104.  }
  105.  
  106.  static inline struct dma_async_tx_descriptor *dmaengine_prep_slave_single(
  107. diff --git include/linux/fs.h include/linux/fs.h
  108. index ff0a992846a3..bd6072556269 100644
  109. --- linux-4.14.336/include/linux/fs.h
  110. +++ linux-4.14.336/include/linux/fs.h
  111. @@ -296,6 +296,8 @@ enum rw_hint {
  112.  #define IOCB_SYNC		(1 << 5)
  113.  #define IOCB_WRITE		(1 << 6)
  114.  #define IOCB_NOWAIT		(1 << 7)
  115. +/* kiocb is a read or write operation submitted by fs/aio.c. */
  116. +#define IOCB_AIO_RW		(1 << 23)
  117.  
  118.  struct kiocb {
  119.  	struct file		*ki_filp;
  120. diff --git include/linux/lsm_hooks.h include/linux/lsm_hooks.h
  121. index 569debc49f3d..28ff40daccff 100644
  122. --- linux-4.14.336/include/linux/lsm_hooks.h
  123. +++ linux-4.14.336/include/linux/lsm_hooks.h
  124. @@ -466,6 +466,12 @@
  125.   *	simple integer value.  When @arg represents a user space pointer, it
  126.   *	should never be used by the security module.
  127.   *	Return 0 if permission is granted.
  128. + * @file_ioctl_compat:
  129. + *	@file contains the file structure.
  130. + *	@cmd contains the operation to perform.
  131. + *	@arg contains the operational arguments.
  132. + *	Check permission for a compat ioctl operation on @file.
  133. + *	Return 0 if permission is granted.
  134.   * @mmap_addr :
  135.   *	Check permissions for a mmap operation at @addr.
  136.   *	@addr contains virtual address that will be used for the operation.
  137. @@ -1486,6 +1492,8 @@ union security_list_options {
  138.  	void (*file_free_security)(struct file *file);
  139.  	int (*file_ioctl)(struct file *file, unsigned int cmd,
  140.  				unsigned long arg);
  141. +	int (*file_ioctl_compat)(struct file *file, unsigned int cmd,
  142. +				unsigned long arg);
  143.  	int (*mmap_addr)(unsigned long addr);
  144.  	int (*mmap_file)(struct file *file, unsigned long reqprot,
  145.  				unsigned long prot, unsigned long flags);
  146. @@ -1764,6 +1772,7 @@ struct security_hook_heads {
  147.  	struct list_head file_alloc_security;
  148.  	struct list_head file_free_security;
  149.  	struct list_head file_ioctl;
  150. +	struct list_head file_ioctl_compat;
  151.  	struct list_head mmap_addr;
  152.  	struct list_head mmap_file;
  153.  	struct list_head file_mprotect;
  154. diff --git include/linux/pci_ids.h include/linux/pci_ids.h
  155. index 83f576d45d78..c977e636a1dd 100644
  156. --- linux-4.14.336/include/linux/pci_ids.h
  157. +++ linux-4.14.336/include/linux/pci_ids.h
  158. @@ -2953,6 +2953,7 @@
  159.  #define PCI_DEVICE_ID_INTEL_82443GX_0	0x71a0
  160.  #define PCI_DEVICE_ID_INTEL_82443GX_2	0x71a2
  161.  #define PCI_DEVICE_ID_INTEL_82372FB_1	0x7601
  162. +#define PCI_DEVICE_ID_INTEL_HDA_ARL	0x7728
  163.  #define PCI_DEVICE_ID_INTEL_SCH_LPC	0x8119
  164.  #define PCI_DEVICE_ID_INTEL_SCH_IDE	0x811a
  165.  #define PCI_DEVICE_ID_INTEL_E6XX_CU	0x8183
  166. diff --git include/linux/security.h include/linux/security.h
  167. index 1c8968a267c2..cf77cd971795 100644
  168. --- linux-4.14.336/include/linux/security.h
  169. +++ linux-4.14.336/include/linux/security.h
  170. @@ -306,6 +306,8 @@ int security_file_permission(struct file *file, int mask);
  171.  int security_file_alloc(struct file *file);
  172.  void security_file_free(struct file *file);
  173.  int security_file_ioctl(struct file *file, unsigned int cmd, unsigned long arg);
  174. +int security_file_ioctl_compat(struct file *file, unsigned int cmd,
  175. +			       unsigned long arg);
  176.  int security_mmap_file(struct file *file, unsigned long prot,
  177.  			unsigned long flags);
  178.  int security_mmap_addr(unsigned long addr);
  179. @@ -827,6 +829,13 @@ static inline int security_file_ioctl(struct file *file, unsigned int cmd,
  180.  	return 0;
  181.  }
  182.  
  183. +static inline int security_file_ioctl_compat(struct file *file,
  184. +					     unsigned int cmd,
  185. +					     unsigned long arg)
  186. +{
  187. +	return 0;
  188. +}
  189. +
  190.  static inline int security_mmap_file(struct file *file, unsigned long prot,
  191.  				     unsigned long flags)
  192.  {
  193. diff --git include/linux/spi/spi.h include/linux/spi/spi.h
  194. index a8f6606dd498..5c7741ca3b99 100644
  195. --- linux-4.14.336/include/linux/spi/spi.h
  196. +++ linux-4.14.336/include/linux/spi/spi.h
  197. @@ -153,6 +153,7 @@ struct spi_device {
  198.  #define	SPI_MODE_1	(0|SPI_CPHA)
  199.  #define	SPI_MODE_2	(SPI_CPOL|0)
  200.  #define	SPI_MODE_3	(SPI_CPOL|SPI_CPHA)
  201. +#define	SPI_MODE_X_MASK	(SPI_CPOL|SPI_CPHA)
  202.  #define	SPI_CS_HIGH	0x04			/* chipselect active high? */
  203.  #define	SPI_LSB_FIRST	0x08			/* per-word bits-on-wire */
  204.  #define	SPI_3WIRE	0x10			/* SI/SO signals shared */
  205. diff --git include/linux/units.h include/linux/units.h
  206. new file mode 100644
  207. index 000000000000..a0af6d2ef4e5
  208. --- /dev/null
  209. +++ linux-4.14.336/include/linux/units.h
  210. @@ -0,0 +1,92 @@
  211. +/* SPDX-License-Identifier: GPL-2.0 */
  212. +#ifndef _LINUX_UNITS_H
  213. +#define _LINUX_UNITS_H
  214. +
  215. +#include <linux/kernel.h>
  216. +
  217. +#define HZ_PER_KHZ		1000UL
  218. +#define KHZ_PER_MHZ		1000UL
  219. +#define HZ_PER_MHZ		1000000UL
  220. +
  221. +#define MILLIWATT_PER_WATT	1000UL
  222. +#define MICROWATT_PER_MILLIWATT	1000UL
  223. +#define MICROWATT_PER_WATT	1000000UL
  224. +
  225. +#define ABSOLUTE_ZERO_MILLICELSIUS -273150
  226. +
  227. +static inline long milli_kelvin_to_millicelsius(long t)
  228. +{
  229. +	return t + ABSOLUTE_ZERO_MILLICELSIUS;
  230. +}
  231. +
  232. +static inline long millicelsius_to_milli_kelvin(long t)
  233. +{
  234. +	return t - ABSOLUTE_ZERO_MILLICELSIUS;
  235. +}
  236. +
  237. +#define MILLIDEGREE_PER_DEGREE 1000
  238. +#define MILLIDEGREE_PER_DECIDEGREE 100
  239. +
  240. +static inline long kelvin_to_millicelsius(long t)
  241. +{
  242. +	return milli_kelvin_to_millicelsius(t * MILLIDEGREE_PER_DEGREE);
  243. +}
  244. +
  245. +static inline long millicelsius_to_kelvin(long t)
  246. +{
  247. +	t = millicelsius_to_milli_kelvin(t);
  248. +
  249. +	return DIV_ROUND_CLOSEST(t, MILLIDEGREE_PER_DEGREE);
  250. +}
  251. +
  252. +static inline long deci_kelvin_to_celsius(long t)
  253. +{
  254. +	t = milli_kelvin_to_millicelsius(t * MILLIDEGREE_PER_DECIDEGREE);
  255. +
  256. +	return DIV_ROUND_CLOSEST(t, MILLIDEGREE_PER_DEGREE);
  257. +}
  258. +
  259. +static inline long celsius_to_deci_kelvin(long t)
  260. +{
  261. +	t = millicelsius_to_milli_kelvin(t * MILLIDEGREE_PER_DEGREE);
  262. +
  263. +	return DIV_ROUND_CLOSEST(t, MILLIDEGREE_PER_DECIDEGREE);
  264. +}
  265. +
  266. +/**
  267. + * deci_kelvin_to_millicelsius_with_offset - convert Kelvin to Celsius
  268. + * @t: temperature value in decidegrees Kelvin
  269. + * @offset: difference between Kelvin and Celsius in millidegrees
  270. + *
  271. + * Return: temperature value in millidegrees Celsius
  272. + */
  273. +static inline long deci_kelvin_to_millicelsius_with_offset(long t, long offset)
  274. +{
  275. +	return t * MILLIDEGREE_PER_DECIDEGREE - offset;
  276. +}
  277. +
  278. +static inline long deci_kelvin_to_millicelsius(long t)
  279. +{
  280. +	return milli_kelvin_to_millicelsius(t * MILLIDEGREE_PER_DECIDEGREE);
  281. +}
  282. +
  283. +static inline long millicelsius_to_deci_kelvin(long t)
  284. +{
  285. +	t = millicelsius_to_milli_kelvin(t);
  286. +
  287. +	return DIV_ROUND_CLOSEST(t, MILLIDEGREE_PER_DECIDEGREE);
  288. +}
  289. +
  290. +static inline long kelvin_to_celsius(long t)
  291. +{
  292. +	return t + DIV_ROUND_CLOSEST(ABSOLUTE_ZERO_MILLICELSIUS,
  293. +				     MILLIDEGREE_PER_DEGREE);
  294. +}
  295. +
  296. +static inline long celsius_to_kelvin(long t)
  297. +{
  298. +	return t - DIV_ROUND_CLOSEST(ABSOLUTE_ZERO_MILLICELSIUS,
  299. +				     MILLIDEGREE_PER_DEGREE);
  300. +}
  301. +
  302. +#endif /* _LINUX_UNITS_H */
  303. diff --git include/net/af_unix.h include/net/af_unix.h
  304. index 7ec1cdb66be8..e514508bdc92 100644
  305. --- linux-4.14.336/include/net/af_unix.h
  306. +++ linux-4.14.336/include/net/af_unix.h
  307. @@ -43,12 +43,6 @@ struct unix_skb_parms {
  308.  
  309.  #define UNIXCB(skb) 	(*(struct unix_skb_parms *)&((skb)->cb))
  310.  
  311. -#define unix_state_lock(s)	spin_lock(&unix_sk(s)->lock)
  312. -#define unix_state_unlock(s)	spin_unlock(&unix_sk(s)->lock)
  313. -#define unix_state_lock_nested(s) \
  314. -				spin_lock_nested(&unix_sk(s)->lock, \
  315. -				SINGLE_DEPTH_NESTING)
  316. -
  317.  /* The AF_UNIX socket */
  318.  struct unix_sock {
  319.  	/* WARNING: sk has to be the first member */
  320. @@ -72,6 +66,20 @@ static inline struct unix_sock *unix_sk(const struct sock *sk)
  321.  	return (struct unix_sock *)sk;
  322.  }
  323.  
  324. +#define unix_state_lock(s)	spin_lock(&unix_sk(s)->lock)
  325. +#define unix_state_unlock(s)	spin_unlock(&unix_sk(s)->lock)
  326. +enum unix_socket_lock_class {
  327. +	U_LOCK_NORMAL,
  328. +	U_LOCK_SECOND,	/* for double locking, see unix_state_double_lock(). */
  329. +	U_LOCK_DIAG, /* used while dumping icons, see sk_diag_dump_icons(). */
  330. +};
  331. +
  332. +static inline void unix_state_lock_nested(struct sock *sk,
  333. +				   enum unix_socket_lock_class subclass)
  334. +{
  335. +	spin_lock_nested(&unix_sk(sk)->lock, subclass);
  336. +}
  337. +
  338.  #define peer_wait peer_wq.wait
  339.  
  340.  long unix_inq_len(struct sock *sk);
  341. diff --git include/net/bluetooth/hci_core.h include/net/bluetooth/hci_core.h
  342. index 8f899ad4a754..bac3d79139b2 100644
  343. --- linux-4.14.336/include/net/bluetooth/hci_core.h
  344. +++ linux-4.14.336/include/net/bluetooth/hci_core.h
  345. @@ -647,7 +647,6 @@ void hci_inquiry_cache_flush(struct hci_dev *hdev);
  346.  /* ----- linux-4.14.336/HCI Connections ----- */
  347.  enum {
  348.  	HCI_CONN_AUTH_PEND,
  349. -	HCI_CONN_REAUTH_PEND,
  350.  	HCI_CONN_ENCRYPT_PEND,
  351.  	HCI_CONN_RSWITCH_PEND,
  352.  	HCI_CONN_MODE_CHANGE_PEND,
  353. diff --git include/net/dst_ops.h include/net/dst_ops.h
  354. index 443863c7b8da..632086b2f644 100644
  355. --- linux-4.14.336/include/net/dst_ops.h
  356. +++ linux-4.14.336/include/net/dst_ops.h
  357. @@ -16,7 +16,7 @@ struct dst_ops {
  358.  	unsigned short		family;
  359.  	unsigned int		gc_thresh;
  360.  
  361. -	int			(*gc)(struct dst_ops *ops);
  362. +	void			(*gc)(struct dst_ops *ops);
  363.  	struct dst_entry *	(*check)(struct dst_entry *, __u32 cookie);
  364.  	unsigned int		(*default_advmss)(const struct dst_entry *);
  365.  	unsigned int		(*mtu)(const struct dst_entry *);
  366. @@ -53,9 +53,11 @@ static inline int dst_entries_get_slow(struct dst_ops *dst)
  367.  	return percpu_counter_sum_positive(&dst->pcpuc_entries);
  368.  }
  369.  
  370. +#define DST_PERCPU_COUNTER_BATCH 32
  371.  static inline void dst_entries_add(struct dst_ops *dst, int val)
  372.  {
  373. -	percpu_counter_add(&dst->pcpuc_entries, val);
  374. +	percpu_counter_add_batch(&dst->pcpuc_entries, val,
  375. +				 DST_PERCPU_COUNTER_BATCH);
  376.  }
  377.  
  378.  static inline int dst_entries_init(struct dst_ops *dst)
  379. diff --git include/net/llc_pdu.h include/net/llc_pdu.h
  380. index 49aa79c7b278..581cd37aa98b 100644
  381. --- linux-4.14.336/include/net/llc_pdu.h
  382. +++ linux-4.14.336/include/net/llc_pdu.h
  383. @@ -262,8 +262,7 @@ static inline void llc_pdu_header_init(struct sk_buff *skb, u8 type,
  384.   */
  385.  static inline void llc_pdu_decode_sa(struct sk_buff *skb, u8 *sa)
  386.  {
  387. -	if (skb->protocol == htons(ETH_P_802_2))
  388. -		memcpy(sa, eth_hdr(skb)->h_source, ETH_ALEN);
  389. +	memcpy(sa, eth_hdr(skb)->h_source, ETH_ALEN);
  390.  }
  391.  
  392.  /**
  393. @@ -275,8 +274,7 @@ static inline void llc_pdu_decode_sa(struct sk_buff *skb, u8 *sa)
  394.   */
  395.  static inline void llc_pdu_decode_da(struct sk_buff *skb, u8 *da)
  396.  {
  397. -	if (skb->protocol == htons(ETH_P_802_2))
  398. -		memcpy(da, eth_hdr(skb)->h_dest, ETH_ALEN);
  399. +	memcpy(da, eth_hdr(skb)->h_dest, ETH_ALEN);
  400.  }
  401.  
  402.  /**
  403. diff --git include/net/netns/ipv6.h include/net/netns/ipv6.h
  404. index c004d051c2d3..290ca18589ee 100644
  405. --- linux-4.14.336/include/net/netns/ipv6.h
  406. +++ linux-4.14.336/include/net/netns/ipv6.h
  407. @@ -64,8 +64,8 @@ struct netns_ipv6 {
  408.  	struct dst_ops		ip6_dst_ops;
  409.  	rwlock_t		fib6_walker_lock;
  410.  	spinlock_t		fib6_gc_lock;
  411. -	unsigned int		 ip6_rt_gc_expire;
  412. -	unsigned long		 ip6_rt_last_gc;
  413. +	atomic_t		ip6_rt_gc_expire;
  414. +	unsigned long		ip6_rt_last_gc;
  415.  #ifdef CONFIG_IPV6_MULTIPLE_TABLES
  416.  	bool			 fib6_has_custom_rules;
  417.  	struct rt6_info         *ip6_prohibit_entry;
  418. diff --git include/uapi/linux/btrfs.h include/uapi/linux/btrfs.h
  419. index 86d2a52b4665..ee7a34c237a5 100644
  420. --- linux-4.14.336/include/uapi/linux/btrfs.h
  421. +++ linux-4.14.336/include/uapi/linux/btrfs.h
  422. @@ -522,6 +522,9 @@ struct btrfs_ioctl_clone_range_args {
  423.   */
  424.  #define BTRFS_DEFRAG_RANGE_COMPRESS 1
  425.  #define BTRFS_DEFRAG_RANGE_START_IO 2
  426. +#define BTRFS_DEFRAG_RANGE_FLAGS_SUPP	(BTRFS_DEFRAG_RANGE_COMPRESS |		\
  427. +					 BTRFS_DEFRAG_RANGE_START_IO)
  428. +
  429.  struct btrfs_ioctl_defrag_range_args {
  430.  	/* start of the defrag operation */
  431.  	__u64 start;
  432. diff --git include/uapi/linux/netfilter/nf_tables.h include/uapi/linux/netfilter/nf_tables.h
  433. index c7bb18ea4962..835e9f345f35 100644
  434. --- linux-4.14.336/include/uapi/linux/netfilter/nf_tables.h
  435. +++ linux-4.14.336/include/uapi/linux/netfilter/nf_tables.h
  436. @@ -229,9 +229,11 @@ enum nft_rule_attributes {
  437.  /**
  438.   * enum nft_rule_compat_flags - nf_tables rule compat flags
  439.   *
  440. + * @NFT_RULE_COMPAT_F_UNUSED: unused
  441.   * @NFT_RULE_COMPAT_F_INV: invert the check result
  442.   */
  443.  enum nft_rule_compat_flags {
  444. +	NFT_RULE_COMPAT_F_UNUSED = (1 << 0),
  445.  	NFT_RULE_COMPAT_F_INV	= (1 << 1),
  446.  	NFT_RULE_COMPAT_F_MASK	= NFT_RULE_COMPAT_F_INV,
  447.  };