History

Merge 7.2-rc7 into usb-next

We need the USB fixes in here as well to build on top of.

Greg Kroah-Hartman committed 3 months ago

Commit acbecf62 parents 5d5fd84 db2ddb8899 files · +13027 −4914Browse files

Showing the changes to include (42 of 899 files). Show all

Unified · Split

42 files
  1. include/acpi/cppc_acpi.h +3 −2
  2. include/hyperv/hvhdk_mini.h +2 −1
  3. include/kvm/arm_vgic.h +0 −3
  4. include/linux/ata.h +3 −3
  5. include/linux/device.h +2 −0
  6. include/linux/dibs.h +1 −1
  7. include/linux/dma/qcom_bam_dma.h +16 −5
  8. include/linux/ethtool.h +1 −0
  9. include/linux/fixp-arith.h +2 −2
  10. include/linux/hwmon.h +1 −2
  11. include/linux/if_tun.h +0 −3
  12. include/linux/iommu.h +5 −0
  13. include/linux/libata.h +5 −1
  14. include/linux/memcontrol.h +25 −0
  15. include/linux/mmap_lock.h +1 −0
  16. include/linux/netdevice.h +4 −7
  17. include/linux/netfilter/ipset/ip_set.h +3 −3
  18. include/linux/netfilter/nf_conntrack_sip.h +1 −1
  19. include/linux/netfs.h +1 −0
  20. include/linux/nvmem-provider.h +6 −0
  21. include/linux/psi.h +3 −1
  22. include/linux/ptr_ring.h +2 −18
  23. include/linux/rolling_buffer.h +3 −3
  24. include/linux/sched/ext.h +5 −5
  25. include/linux/usb/quirks.h +3 −0
  26. include/net/addrconf.h +2 −2
  27. include/net/bluetooth/hci_core.h +3 −1
  28. include/net/ip_vs.h +28 −8
  29. include/net/libeth/xsk.h +1 −1
  30. include/net/netfilter/nf_conntrack_expect.h +3 −0
  31. include/net/netfilter/nf_tables.h +3 −1
  32. include/net/sch_generic.h +1 −0
  33. include/net/xdp_sock.h +6 −40
  34. include/net/xdp_sock_drv.h +66 −11
  35. include/net/xsk_buff_pool.h +7 −2
  36. include/scsi/libsas.h +2 −1
  37. include/sound/hda-sdw-bpt.h +3 −2
  38. include/sound/sdca_fdl.h +2 −0
  39. include/sound/sdca_interrupts.h +12 −2
  40. include/sound/sdca_jack.h +3 −0
  41. include/sound/soc-component.h +2 −0
  42. include/trace/events/btrfs.h +35 −0
include/acpi/cppc_acpi.h+3−2
@@ -170,7 +170,7 @@ extern u64 cppc_get_dmi_max_khz(void); · 169 unmodified lines
170extern unsigned int cppc_perf_to_khz(struct cppc_perf_caps *caps, unsigned int perf);170extern unsigned int cppc_perf_to_khz(struct cppc_perf_caps *caps, unsigned int perf);
171extern unsigned int cppc_khz_to_perf(struct cppc_perf_caps *caps, unsigned int freq);171extern unsigned int cppc_khz_to_perf(struct cppc_perf_caps *caps, unsigned int freq);
172extern bool acpi_cpc_valid(void);172extern bool acpi_cpc_valid(void);
173extern bool cppc_allow_fast_switch(void);173bool cppc_allow_fast_switch(const struct cpumask *cpus);
174extern int acpi_get_psd_map(unsigned int cpu, struct cppc_cpudata *cpu_data);174extern int acpi_get_psd_map(unsigned int cpu, struct cppc_cpudata *cpu_data);
175extern int cppc_get_transition_latency(int cpu);175extern int cppc_get_transition_latency(int cpu);
176extern bool cpc_ffh_supported(void);176extern bool cpc_ffh_supported(void);
@@ -234,7 +234,8 @@ static inline bool acpi_cpc_valid(void) · 57 unmodified lines
234{234{
235 return false;235 return false;
236}236}
237static inline bool cppc_allow_fast_switch(void)237
238static inline bool cppc_allow_fast_switch(const struct cpumask *cpus)
238{239{
239 return false;240 return false;
240}241}
include/hyperv/hvhdk_mini.h+2−1
@@ -184,8 +184,9 @@ enum hv_dynamic_processor_feature_property { · 183 unmodified lines
184 184
185struct hv_input_get_system_property {185struct hv_input_get_system_property {
186 u32 property_id; /* enum hv_system_property */186 u32 property_id; /* enum hv_system_property */
187 u32 reserved;
187 union {188 union {
188 u32 as_uint32;189 u64 as_uint64;
189#if IS_ENABLED(CONFIG_X86)190#if IS_ENABLED(CONFIG_X86)
190 /* enum hv_dynamic_processor_feature_property */191 /* enum hv_dynamic_processor_feature_property */
191 u32 hv_processor_feature;192 u32 hv_processor_feature;
include/kvm/arm_vgic.h+0−3
@@ -247,9 +247,6 @@ struct vgic_irq { · 246 unmodified lines
247 * affinity reg (v3).247 * affinity reg (v3).
248 */248 */
249 249
250 bool pending_release:1; /* Used for LPIs only, unreferenced IRQ
251 * pending a release */
252
253 bool pending_latch:1; /* The pending latch state used to calculate250 bool pending_latch:1; /* The pending latch state used to calculate
254 * the pending state for both level251 * the pending state for both level
255 * and edge triggered IRQs. */252 * and edge triggered IRQs. */
include/linux/ata.h+3−3
@@ -762,8 +762,7 @@ static inline bool ata_id_sense_reporting_enabled(const u16 *id) · 761 unmodified lines
762 return id[ATA_ID_COMMAND_SET_4] & BIT(6);762 return id[ATA_ID_COMMAND_SET_4] & BIT(6);
763}763}
764 764
765/**765/*
766 *
767 * Word: 206 - SCT Command Transport766 * Word: 206 - SCT Command Transport
768 * 15:12 - Vendor Specific767 * 15:12 - Vendor Specific
769 * 11:6 - Reserved768 * 11:6 - Reserved
@@ -810,8 +809,9 @@ static inline bool ata_id_sct_supported(const u16 *id) · 40 unmodified lines
810 *809 *
811 * The practical impact of this is that ata_id_major_version cannot810 * The practical impact of this is that ata_id_major_version cannot
812 * reliably report on drives below ATA3.811 * reliably report on drives below ATA3.
812 *
813 * Returns: major version of ATA drive level or %0 if unknown
813 */814 */
814
815static inline unsigned int ata_id_major_version(const u16 *id)815static inline unsigned int ata_id_major_version(const u16 *id)
816{816{
817 unsigned int mver;817 unsigned int mver;
include/linux/device.h+2−0
@@ -99,7 +99,9 @@ struct device_type { · 98 unmodified lines
99 * struct device_attribute - Interface for exporting device attributes.99 * struct device_attribute - Interface for exporting device attributes.
100 * @attr: sysfs attribute definition.100 * @attr: sysfs attribute definition.
101 * @show: Show handler.101 * @show: Show handler.
102 * @show_const: Show handler (read-only).
102 * @store: Store handler.103 * @store: Store handler.
104 * @store_const: Store handler (read-only).
103 */105 */
104struct device_attribute {106struct device_attribute {
105 struct attribute attr;107 struct attribute attr;
include/linux/dibs.h+1−1
@@ -439,7 +439,7 @@ static inline void *dibs_get_priv(struct dibs_dev *dev, · 438 unmodified lines
439/**439/**
440 * dibs_dev_alloc() - allocate and reference device structure440 * dibs_dev_alloc() - allocate and reference device structure
441 *441 *
442 * The following fields will be valid upon successful return: dev442 * The following fields will be valid upon successful return: dev, lock
443 * NOTE: Use put_device(dibs_get_dev(@dibs)) to give up your reference instead443 * NOTE: Use put_device(dibs_get_dev(@dibs)) to give up your reference instead
444 * of freeing @dibs @dev directly once you have successfully called this444 * of freeing @dibs @dev directly once you have successfully called this
445 * function.445 * function.
include/linux/dma/qcom_bam_dma.h+16−5
@@ -13,9 +13,12 @@ · 12 unmodified lines
13 * supported by BAM DMA Engine.13 * supported by BAM DMA Engine.
14 *14 *
15 * @cmd_and_addr - upper 8 bits command and lower 24 bits register address.15 * @cmd_and_addr - upper 8 bits command and lower 24 bits register address.
16 * @data - for write command: content to be written into peripheral register.16 * @data - For write command: content to be written into peripheral register.
17 * for read command: dest addr to write peripheral register value.17 * For read command: lower 32 bits of destination address.
18 * @mask - register mask.18 * @mask - For write command: register write mask.
19 * For read command on BAM v1.6.0+: upper 4 bits of destination address.
20 * For read command on BAM < v1.6.0: ignored by hardware.
21 * Setting to 0 ensures 32-bit addressing compatibility.
19 * @reserved - for future usage.22 * @reserved - for future usage.
20 *23 *
21 */24 */
@@ -42,6 +45,10 @@ enum bam_command_type { · 20 unmodified lines
42 * @addr: target address45 * @addr: target address
43 * @cmd: BAM command46 * @cmd: BAM command
44 * @data: actual data for write and dest addr for read in le3247 * @data: actual data for write and dest addr for read in le32
48 *
49 * For BAM v1.6.0+, the mask field behavior depends on command type:
50 * - Write commands: mask = write mask (typically 0xffffffff)
51 * - Read commands: mask = upper 4 bits of destination address (0 for 32-bit)
45 */52 */
46static inline void53static inline void
47bam_prep_ce_le32(struct bam_cmd_element *bam_ce, u32 addr,54bam_prep_ce_le32(struct bam_cmd_element *bam_ce, u32 addr,
@@ -50,7 +57,11 @@ bam_prep_ce_le32(struct bam_cmd_element *bam_ce, u32 addr, · 2 unmodified lines
50 bam_ce->cmd_and_addr =57 bam_ce->cmd_and_addr =
51 cpu_to_le32((addr & 0xffffff) | ((cmd & 0xff) << 24));58 cpu_to_le32((addr & 0xffffff) | ((cmd & 0xff) << 24));
52 bam_ce->data = data;59 bam_ce->data = data;
53 bam_ce->mask = cpu_to_le32(0xffffffff);60 if (cmd == BAM_READ_COMMAND)
61 bam_ce->mask = cpu_to_le32(0x0); /* 32-bit addressing */
62 else
63 bam_ce->mask = cpu_to_le32(0xffffffff); /* Write mask */
64 bam_ce->reserved = 0;
54}65}
55 66
56/*67/*
@@ -60,7 +71,7 @@ bam_prep_ce_le32(struct bam_cmd_element *bam_ce, u32 addr, · 3 unmodified lines
60 * @bam_ce: BAM command element71 * @bam_ce: BAM command element
61 * @addr: target address72 * @addr: target address
62 * @cmd: BAM command73 * @cmd: BAM command
63 * @data: actual data for write and dest addr for read74 * @data: actual data for write and destination address for read
64 */75 */
65static inline void76static inline void
66bam_prep_ce(struct bam_cmd_element *bam_ce, u32 addr,77bam_prep_ce(struct bam_cmd_element *bam_ce, u32 addr,
include/linux/ethtool.h+1−0
@@ -562,6 +562,7 @@ struct ethtool_fec_hist { · 561 unmodified lines
562 u64 per_lane[ETHTOOL_MAX_LANES];562 u64 per_lane[ETHTOOL_MAX_LANES];
563 } values[ETHTOOL_FEC_HIST_MAX];563 } values[ETHTOOL_FEC_HIST_MAX];
564 const struct ethtool_fec_hist_range *ranges;564 const struct ethtool_fec_hist_range *ranges;
565 struct ethtool_fec_hist_range ranges_buf[ETHTOOL_FEC_HIST_MAX];
565};566};
566/**567/**
567 * struct ethtool_fec_stats - statistics for IEEE 802.3 FEC568 * struct ethtool_fec_stats - statistics for IEEE 802.3 FEC
include/linux/fixp-arith.h+2−2
@@ -40,7 +40,7 @@ static const s32 sin_table[] = { · 39 unmodified lines
40};40};
41 41
42/**42/**
43 * __fixp_sin32() returns the sin of an angle in degrees43 * __fixp_sin32() - returns the sin of an angle in degrees
44 *44 *
45 * @degrees: angle, in degrees, from 0 to 360.45 * @degrees: angle, in degrees, from 0 to 360.
46 *46 *
@@ -64,7 +64,7 @@ static inline s32 __fixp_sin32(int degrees) · 17 unmodified lines
64}64}
65 65
66/**66/**
67 * fixp_sin32() returns the sin of an angle in degrees67 * fixp_sin32() - returns the sin of an angle in degrees
68 *68 *
69 * @degrees: angle, in degrees. The angle can be positive or negative69 * @degrees: angle, in degrees. The angle can be positive or negative
70 *70 *
include/linux/hwmon.h+1−2
@@ -480,8 +480,7 @@ hwmon_device_register_with_info(struct device *dev, · 479 unmodified lines
480 const struct attribute_group **extra_groups);480 const struct attribute_group **extra_groups);
481struct device *481struct device *
482hwmon_device_register_for_thermal(struct device *dev, const char *name,482hwmon_device_register_for_thermal(struct device *dev, const char *name,
483 void *drvdata,483 void *drvdata);
484 const struct attribute_group **extra_groups);
485struct device *484struct device *
486devm_hwmon_device_register_with_info(struct device *dev,485devm_hwmon_device_register_with_info(struct device *dev,
487 const char *name, void *drvdata,486 const char *name, void *drvdata,
include/linux/if_tun.h+0−3
@@ -22,7 +22,6 @@ struct tun_msg_ctl { · 21 unmodified lines
22#if defined(CONFIG_TUN) || defined(CONFIG_TUN_MODULE)22#if defined(CONFIG_TUN) || defined(CONFIG_TUN_MODULE)
23struct socket *tun_get_socket(struct file *);23struct socket *tun_get_socket(struct file *);
24struct ptr_ring *tun_get_tx_ring(struct file *file);24struct ptr_ring *tun_get_tx_ring(struct file *file);
25void tun_wake_queue(struct file *file, int consumed);
26 25
27static inline bool tun_is_xdp_frame(void *ptr)26static inline bool tun_is_xdp_frame(void *ptr)
28{27{
@@ -56,8 +55,6 @@ static inline struct ptr_ring *tun_get_tx_ring(struct file *f) · 27 unmodified lines
56 return ERR_PTR(-EINVAL);55 return ERR_PTR(-EINVAL);
57}56}
58 57
59static inline void tun_wake_queue(struct file *f, int consumed) {}
60
61static inline bool tun_is_xdp_frame(void *ptr)58static inline bool tun_is_xdp_frame(void *ptr)
62{59{
63 return false;60 return false;
include/linux/iommu.h+5−0
@@ -1704,6 +1704,7 @@ void iopf_free_group(struct iopf_group *group); · 1703 unmodified lines
1704int iommu_report_device_fault(struct device *dev, struct iopf_fault *evt);1704int iommu_report_device_fault(struct device *dev, struct iopf_fault *evt);
1705void iopf_group_response(struct iopf_group *group,1705void iopf_group_response(struct iopf_group *group,
1706 enum iommu_page_response_code status);1706 enum iommu_page_response_code status);
1707void iopf_group_dequeue(struct iopf_group *group);
1707#else1708#else
1708static inline int1709static inline int
1709iopf_queue_add_device(struct iopf_queue *queue, struct device *dev)1710iopf_queue_add_device(struct iopf_queue *queue, struct device *dev)
@@ -1749,5 +1750,9 @@ static inline void iopf_group_response(struct iopf_group *group, · 39 unmodified lines
1749 enum iommu_page_response_code status)1750 enum iommu_page_response_code status)
1750{1751{
1751}1752}
1753
1754static inline void iopf_group_dequeue(struct iopf_group *group)
1755{
1756}
1752#endif /* CONFIG_IOMMU_IOPF */1757#endif /* CONFIG_IOMMU_IOPF */
1753#endif /* __LINUX_IOMMU_H */1758#endif /* __LINUX_IOMMU_H */
include/linux/libata.h+5−1
@@ -425,7 +425,7 @@ enum { · 424 unmodified lines
425 /* This should match the actual table size of425 /* This should match the actual table size of
426 * ata_eh_cmd_timeout_table in libata-eh.c.426 * ata_eh_cmd_timeout_table in libata-eh.c.
427 */427 */
428 ATA_EH_CMD_TIMEOUT_TABLE_SIZE = 8,428 ATA_EH_CMD_TIMEOUT_TABLE_SIZE = 9,
429 429
430 /* User visible DMA mask for DMA control. DO NOT renumber. */430 /* User visible DMA mask for DMA control. DO NOT renumber. */
431 ATA_DMA_MASK_ATA = (1 << 0), /* DMA on ATA Disk */431 ATA_DMA_MASK_ATA = (1 << 0), /* DMA on ATA Disk */
@@ -1153,6 +1153,9 @@ extern int ata_scsi_ioctl(struct scsi_device *dev, unsigned int cmd, · 721 unmodified lines
1153#endif1153#endif
1154extern enum scsi_qc_status ata_scsi_queuecmd(struct Scsi_Host *h,1154extern enum scsi_qc_status ata_scsi_queuecmd(struct Scsi_Host *h,
1155 struct scsi_cmnd *cmd);1155 struct scsi_cmnd *cmd);
1156enum scsi_timeout_action ata_scsi_retry_deferred_qc(struct ata_port *ap,
1157 struct scsi_cmnd *scmd);
1158enum scsi_timeout_action ata_scsi_eh_timed_out(struct scsi_cmnd *cmd);
1156#if IS_REACHABLE(CONFIG_ATA)1159#if IS_REACHABLE(CONFIG_ATA)
1157bool ata_scsi_dma_need_drain(struct request *rq);1160bool ata_scsi_dma_need_drain(struct request *rq);
1158#else1161#else
@@ -1464,6 +1467,7 @@ extern const struct attribute_group *ata_common_sdev_groups[]; · 305 unmodified lines
1464 .ioctl = ata_scsi_ioctl, \1467 .ioctl = ata_scsi_ioctl, \
1465 ATA_SCSI_COMPAT_IOCTL \1468 ATA_SCSI_COMPAT_IOCTL \
1466 .queuecommand = ata_scsi_queuecmd, \1469 .queuecommand = ata_scsi_queuecmd, \
1470 .eh_timed_out = ata_scsi_eh_timed_out, \
1467 .dma_need_drain = ata_scsi_dma_need_drain, \1471 .dma_need_drain = ata_scsi_dma_need_drain, \
1468 .this_id = ATA_SHT_THIS_ID, \1472 .this_id = ATA_SHT_THIS_ID, \
1469 .emulated = ATA_SHT_EMULATED, \1473 .emulated = ATA_SHT_EMULATED, \
include/linux/memcontrol.h+25−0
@@ -1493,6 +1493,31 @@ static inline void lruvec_lock_irq(struct lruvec *lruvec) · 1492 unmodified lines
1493 spin_lock_irq(&lruvec->lru_lock);1493 spin_lock_irq(&lruvec->lru_lock);
1494}1494}
1495 1495
1496static inline struct lruvec *lruvec_live_lock_irq(struct lruvec *lruvec)
1497{
1498#ifdef CONFIG_MEMCG
1499 struct pglist_data *pgdat = lruvec_pgdat(lruvec);
1500 struct mem_cgroup *memcg = lruvec_memcg(lruvec);
1501
1502 rcu_read_lock();
1503
1504 /*
1505 * The memcg can be NULL when the memory controller is disabled.
1506 * Otherwise, the caller keeps the memcg owning @lruvec alive.
1507 */
1508 while (unlikely(memcg && css_is_dying(&memcg->css))) {
1509 memcg = parent_mem_cgroup(memcg);
1510 lruvec = mem_cgroup_lruvec(memcg, pgdat);
1511 }
1512
1513 spin_lock_irq(&lruvec->lru_lock);
1514#else
1515 lruvec_lock_irq(lruvec);
1516#endif
1517
1518 return lruvec;
1519}
1520
1496static inline void lruvec_unlock(struct lruvec *lruvec)1521static inline void lruvec_unlock(struct lruvec *lruvec)
1497{1522{
1498 spin_unlock(&lruvec->lru_lock);1523 spin_unlock(&lruvec->lru_lock);
include/linux/mmap_lock.h+1−0
@@ -621,6 +621,7 @@ static inline void mmap_read_unlock(struct mm_struct *mm) · 620 unmodified lines
621 621
622DEFINE_GUARD(mmap_read_lock, struct mm_struct *,622DEFINE_GUARD(mmap_read_lock, struct mm_struct *,
623 mmap_read_lock(_T), mmap_read_unlock(_T))623 mmap_read_lock(_T), mmap_read_unlock(_T))
624DEFINE_GUARD_COND(mmap_read_lock, _try, mmap_read_trylock(_T))
624 625
625static inline void mmap_read_unlock_non_owner(struct mm_struct *mm)626static inline void mmap_read_unlock_non_owner(struct mm_struct *mm)
626{627{
include/linux/netdevice.h+4−7
@@ -300,9 +300,11 @@ struct hh_cache { · 299 unmodified lines
300 * We could use other alignment values, but we must maintain the300 * We could use other alignment values, but we must maintain the
301 * relationship HH alignment <= LL alignment.301 * relationship HH alignment <= LL alignment.
302 */302 */
303#define LL_RESERVED_SPACE(dev) \303#define LL_RESERVED_SPACE_EX(dev, hlen) \
304 ((((dev)->hard_header_len + READ_ONCE((dev)->needed_headroom)) \304 ((((hlen) + READ_ONCE((dev)->needed_headroom)) \
305 & ~(HH_DATA_MOD - 1)) + HH_DATA_MOD)305 & ~(HH_DATA_MOD - 1)) + HH_DATA_MOD)
306#define LL_RESERVED_SPACE(dev) \
307 LL_RESERVED_SPACE_EX(dev, (dev)->hard_header_len)
306#define LL_RESERVED_SPACE_EXTRA(dev,extra) \308#define LL_RESERVED_SPACE_EXTRA(dev,extra) \
307 ((((dev)->hard_header_len + READ_ONCE((dev)->needed_headroom) + (extra)) \309 ((((dev)->hard_header_len + READ_ONCE((dev)->needed_headroom) + (extra)) \
308 & ~(HH_DATA_MOD - 1)) + HH_DATA_MOD)310 & ~(HH_DATA_MOD - 1)) + HH_DATA_MOD)
@@ -3531,11 +3533,6 @@ static inline bool dev_validate_header(const struct net_device *dev, · 3222 unmodified lines
3531 if (len < dev->min_header_len)3533 if (len < dev->min_header_len)
3532 return false;3534 return false;
3533 3535
3534 if (capable(CAP_SYS_RAWIO)) {
3535 memset(ll_header + len, 0, dev->hard_header_len - len);
3536 return true;
3537 }
3538
3539 if (dev->header_ops && dev->header_ops->validate)3536 if (dev->header_ops && dev->header_ops->validate)
3540 return dev->header_ops->validate(ll_header, len);3537 return dev->header_ops->validate(ll_header, len);
3541 3538
include/linux/netfilter/ipset/ip_set.h+3−3
@@ -244,8 +244,8 @@ extern void ip_set_type_unregister(struct ip_set_type *set_type); · 243 unmodified lines
244 244
245/* A generic IP set */245/* A generic IP set */
246struct ip_set {246struct ip_set {
247 /* For call_cru in destroy */247 /* for set destruction */
248 struct rcu_head rcu;248 struct rcu_work rwork;
249 /* The name of the set */249 /* The name of the set */
250 char name[IPSET_MAXNAMELEN];250 char name[IPSET_MAXNAMELEN];
251 /* Lock protecting the set data */251 /* Lock protecting the set data */
@@ -273,7 +273,7 @@ struct ip_set { · 21 unmodified lines
273 /* Number of elements (vs timeout) */273 /* Number of elements (vs timeout) */
274 u32 elements;274 u32 elements;
275 /* Size of the dynamic extensions (vs timeout) */275 /* Size of the dynamic extensions (vs timeout) */
276 size_t ext_size;276 atomic64_t ext_size;
277 /* Element data size */277 /* Element data size */
278 size_t dsize;278 size_t dsize;
279 /* Offsets to extensions in elements */279 /* Offsets to extensions in elements */
include/linux/netfilter/nf_conntrack_sip.h+1−1
@@ -115,7 +115,7 @@ struct nf_nat_sip_hooks { · 114 unmodified lines
115 unsigned int *datalen);115 unsigned int *datalen);
116 116
117 void (*seq_adjust)(struct sk_buff *skb,117 void (*seq_adjust)(struct sk_buff *skb,
118 unsigned int protoff, s16 off);118 unsigned int protoff, s32 off);
119 119
120 unsigned int (*expect)(struct sk_buff *skb,120 unsigned int (*expect)(struct sk_buff *skb,
121 unsigned int protoff,121 unsigned int protoff,
include/linux/netfs.h+1−0
@@ -255,6 +255,7 @@ struct netfs_io_request { · 254 unmodified lines
255 unsigned long long cleaned_to; /* Position we've cleaned folios to */255 unsigned long long cleaned_to; /* Position we've cleaned folios to */
256 unsigned long long abandon_to; /* Position to abandon folios to */256 unsigned long long abandon_to; /* Position to abandon folios to */
257 const struct folio *no_unlock_folio; /* Don't unlock this folio after read */257 const struct folio *no_unlock_folio; /* Don't unlock this folio after read */
258 gfp_t gfp; /* GFP flags to use */
258 unsigned int direct_bv_count; /* Number of elements in direct_bv[] */259 unsigned int direct_bv_count; /* Number of elements in direct_bv[] */
259 unsigned int debug_id;260 unsigned int debug_id;
260 unsigned int rsize; /* Maximum read size (0 for none) */261 unsigned int rsize; /* Maximum read size (0 for none) */
include/linux/nvmem-provider.h+6−0
@@ -214,6 +214,12 @@ static inline int nvmem_layout_register(struct nvmem_layout *layout) · 213 unmodified lines
214 214
215static inline void nvmem_layout_unregister(struct nvmem_layout *layout) {}215static inline void nvmem_layout_unregister(struct nvmem_layout *layout) {}
216 216
217static inline int nvmem_add_cells_from_dt(struct nvmem_device *nvmem,
218 struct device_node *np)
219{
220 return -EOPNOTSUPP;
221}
222
217#endif /* CONFIG_NVMEM */223#endif /* CONFIG_NVMEM */
218 224
219#if IS_ENABLED(CONFIG_NVMEM) && IS_ENABLED(CONFIG_OF)225#if IS_ENABLED(CONFIG_NVMEM) && IS_ENABLED(CONFIG_OF)
include/linux/psi.h+3−1
@@ -25,7 +25,9 @@ void psi_memstall_leave(unsigned long *flags); · 24 unmodified lines
25int psi_show(struct seq_file *s, struct psi_group *group, enum psi_res res);25int psi_show(struct seq_file *s, struct psi_group *group, enum psi_res res);
26struct psi_trigger *psi_trigger_create(struct psi_group *group, char *buf,26struct psi_trigger *psi_trigger_create(struct psi_group *group, char *buf,
27 enum psi_res res, struct file *file,27 enum psi_res res, struct file *file,
28 struct kernfs_open_file *of);28 struct kernfs_open_file *of,
29 bool *need_rtpoll_worker);
30int psi_trigger_create_rtpoll_worker(struct psi_group *group);
29void psi_trigger_destroy(struct psi_trigger *t);31void psi_trigger_destroy(struct psi_trigger *t);
30 32
31__poll_t psi_trigger_poll(void **trigger_ptr, struct file *file,33__poll_t psi_trigger_poll(void **trigger_ptr, struct file *file,
include/linux/ptr_ring.h+2−18
@@ -96,20 +96,6 @@ static inline bool ptr_ring_full_bh(struct ptr_ring *r) · 95 unmodified lines
96 return ret;96 return ret;
97}97}
98 98
99/* Note: callers invoking this in a loop must use a compiler barrier,
100 * for example cpu_relax(). Callers must hold producer_lock.
101 */
102static inline int __ptr_ring_check_produce(struct ptr_ring *r)
103{
104 if (unlikely(!r->size))
105 return -EINVAL;
106
107 if (data_race(r->queue[r->producer]))
108 return -ENOSPC;
109
110 return 0;
111}
112
113/* Note: callers invoking this in a loop must use a compiler barrier,99/* Note: callers invoking this in a loop must use a compiler barrier,
114 * for example cpu_relax(). Callers must hold producer_lock.100 * for example cpu_relax(). Callers must hold producer_lock.
115 * Callers are responsible for making sure pointer that is being queued101 * Callers are responsible for making sure pointer that is being queued
@@ -117,10 +103,8 @@ static inline int __ptr_ring_check_produce(struct ptr_ring *r) · 1 unmodified line
117 */103 */
118static inline int __ptr_ring_produce(struct ptr_ring *r, void *ptr)104static inline int __ptr_ring_produce(struct ptr_ring *r, void *ptr)
119{105{
120 int p = __ptr_ring_check_produce(r);106 if (unlikely(!r->size) || data_race(r->queue[r->producer]))
121 107 return -ENOSPC;
122 if (p)
123 return p;
124 108
125 /* Make sure the pointer we are storing points to a valid data. */109 /* Make sure the pointer we are storing points to a valid data. */
126 /* Pairs with the dependency ordering in __ptr_ring_consume. */110 /* Pairs with the dependency ordering in __ptr_ring_consume. */
include/linux/rolling_buffer.h+3−3
@@ -43,13 +43,13 @@ struct rolling_buffer_snapshot { · 42 unmodified lines
43#define ROLLBUF_MARK_2 BIT(1)43#define ROLLBUF_MARK_2 BIT(1)
44 44
45int rolling_buffer_init(struct rolling_buffer *roll, unsigned int rreq_id,45int rolling_buffer_init(struct rolling_buffer *roll, unsigned int rreq_id,
46 unsigned int direction);46 unsigned int direction, gfp_t gfp);
47int rolling_buffer_make_space(struct rolling_buffer *roll);47int rolling_buffer_make_space(struct rolling_buffer *roll, gfp_t gfp);
48ssize_t rolling_buffer_load_from_ra(struct rolling_buffer *roll,48ssize_t rolling_buffer_load_from_ra(struct rolling_buffer *roll,
49 struct readahead_control *ractl,49 struct readahead_control *ractl,
50 struct folio_batch *put_batch);50 struct folio_batch *put_batch);
51ssize_t rolling_buffer_append(struct rolling_buffer *roll, struct folio *folio,51ssize_t rolling_buffer_append(struct rolling_buffer *roll, struct folio *folio,
52 unsigned int flags);52 unsigned int flags, gfp_t gfp);
53struct folio_queue *rolling_buffer_delete_spent(struct rolling_buffer *roll);53struct folio_queue *rolling_buffer_delete_spent(struct rolling_buffer *roll);
54void rolling_buffer_clear(struct rolling_buffer *roll);54void rolling_buffer_clear(struct rolling_buffer *roll);
55 55
include/linux/sched/ext.h+5−5
@@ -244,11 +244,11 @@ struct sched_ext_entity { · 243 unmodified lines
244 * to %SCHED_EXT with -%EACCES.244 * to %SCHED_EXT with -%EACCES.
245 *245 *
246 * Can be set from ops.init_task() while the BPF scheduler is being246 * Can be set from ops.init_task() while the BPF scheduler is being
247 * loaded (!scx_init_task_args->fork). If set and the task's policy is247 * loaded. If set and the task's policy is already %SCHED_EXT, the
248 * already %SCHED_EXT, the task's policy is rejected and forcefully248 * task's policy is rejected and forcefully reverted to %SCHED_NORMAL.
249 * reverted to %SCHED_NORMAL. The number of such events are reported249 * The number of such events are reported through
250 * through /sys/kernel/debug/sched_ext::nr_rejected. Setting this flag250 * /sys/kernel/sched_ext/nr_rejected. Setting this flag from any other
251 * during fork is not allowed.251 * ops.init_task() invocation, such as during fork, fails the scheduler.
252 */252 */
253 bool disallow; /* reject switching into SCX */253 bool disallow; /* reject switching into SCX */
254 254
include/linux/usb/quirks.h+3−0
@@ -81,4 +81,7 @@ · 80 unmodified lines
81/* Device claims zero configurations, forcing to 1 */81/* Device claims zero configurations, forcing to 1 */
82#define USB_QUIRK_FORCE_ONE_CONFIG BIT(18)82#define USB_QUIRK_FORCE_ONE_CONFIG BIT(18)
83 83
84/* Use a 255 bytes config descriptor request mirroring windows behavior */
85#define USB_QUIRK_WINDOWS_CONFIG_REQ_SIZE BIT(19)
86
84#endif /* __LINUX_USB_QUIRKS_H */87#endif /* __LINUX_USB_QUIRKS_H */
include/net/addrconf.h+2−2
@@ -405,8 +405,8 @@ static inline struct inet6_dev *in6_dev_get(const struct net_device *dev) · 404 unmodified lines
405 405
406 rcu_read_lock();406 rcu_read_lock();
407 idev = rcu_dereference(dev->ip6_ptr);407 idev = rcu_dereference(dev->ip6_ptr);
408 if (idev)408 if (idev && !refcount_inc_not_zero(&idev->refcnt))
409 refcount_inc(&idev->refcnt);409 idev = NULL;
410 rcu_read_unlock();410 rcu_read_unlock();
411 return idev;411 return idev;
412}412}
include/net/bluetooth/hci_core.h+3−1
@@ -767,9 +767,11 @@ struct hci_conn { · 766 unmodified lines
767 struct dentry *debugfs;767 struct dentry *debugfs;
768 768
769 struct hci_dev *hdev;769 struct hci_dev *hdev;
770
771 spinlock_t proto_lock; /* lock guarding protocol data */
770 void *l2cap_data;772 void *l2cap_data;
771 void *sco_data;773 void *sco_data;
772 void *iso_data;774 void *iso_data __guarded_by(&proto_lock);
773 775
774 struct list_head link_list;776 struct list_head link_list;
775 struct hci_conn *parent;777 struct hci_conn *parent;
include/net/ip_vs.h+28−8
@@ -1972,8 +1972,8 @@ int ip_vs_tunnel_xmit(struct sk_buff *skb, struct ip_vs_conn *cp, · 1971 unmodified lines
1972int ip_vs_dr_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,1972int ip_vs_dr_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
1973 struct ip_vs_protocol *pp, struct ip_vs_iphdr *iph);1973 struct ip_vs_protocol *pp, struct ip_vs_iphdr *iph);
1974int ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,1974int ip_vs_icmp_xmit(struct sk_buff *skb, struct ip_vs_conn *cp,
1975 struct ip_vs_protocol *pp, int offset,1975 struct ip_vs_protocol *pp, unsigned int toff,
1976 unsigned int hooknum, struct ip_vs_iphdr *iph);1976 unsigned int hooknum, struct ip_vs_iphdr *ciph);
1977void ip_vs_dest_dst_rcu_free(struct rcu_head *head);1977void ip_vs_dest_dst_rcu_free(struct rcu_head *head);
1978 1978
1979#ifdef CONFIG_IP_VS_IPV61979#ifdef CONFIG_IP_VS_IPV6
@@ -1986,8 +1986,8 @@ int ip_vs_tunnel_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp, · 6 unmodified lines
1986int ip_vs_dr_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,1986int ip_vs_dr_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
1987 struct ip_vs_protocol *pp, struct ip_vs_iphdr *iph);1987 struct ip_vs_protocol *pp, struct ip_vs_iphdr *iph);
1988int ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,1988int ip_vs_icmp_xmit_v6(struct sk_buff *skb, struct ip_vs_conn *cp,
1989 struct ip_vs_protocol *pp, int offset,1989 struct ip_vs_protocol *pp, unsigned int toff,
1990 unsigned int hooknum, struct ip_vs_iphdr *iph);1990 unsigned int hooknum, struct ip_vs_iphdr *ciph);
1991#endif1991#endif
1992 1992
1993#ifdef CONFIG_SYSCTL1993#ifdef CONFIG_SYSCTL
@@ -2059,15 +2059,15 @@ static inline bool ip_vs_conn_use_hash2(struct ip_vs_conn *cp) · 65 unmodified lines
2059}2059}
2060 2060
2061void ip_vs_nat_icmp(struct sk_buff *skb, struct ip_vs_protocol *pp,2061void ip_vs_nat_icmp(struct sk_buff *skb, struct ip_vs_protocol *pp,
2062 struct ip_vs_conn *cp, int dir);2062 struct ip_vs_conn *cp, int dir, unsigned int toff,
2063 bool has_ports, struct ip_vs_iphdr *ciph);
2063 2064
2064#ifdef CONFIG_IP_VS_IPV62065#ifdef CONFIG_IP_VS_IPV6
2065void ip_vs_nat_icmp_v6(struct sk_buff *skb, struct ip_vs_protocol *pp,2066void ip_vs_nat_icmp_v6(struct sk_buff *skb, struct ip_vs_protocol *pp,
2066 struct ip_vs_conn *cp, int dir);2067 struct ip_vs_conn *cp, int dir, unsigned int toff,
2068 bool has_ports, struct ip_vs_iphdr *ciph);
2067#endif2069#endif
2068 2070
2069__sum16 ip_vs_checksum_complete(struct sk_buff *skb, int offset);
2070
2071static inline __wsum ip_vs_check_diff4(__be32 old, __be32 new, __wsum oldsum)2071static inline __wsum ip_vs_check_diff4(__be32 old, __be32 new, __wsum oldsum)
2072{2072{
2073 __be32 diff[2] = { ~old, new };2073 __be32 diff[2] = { ~old, new };
@@ -2093,6 +2093,26 @@ static inline __wsum ip_vs_check_diff2(__be16 old, __be16 new, __wsum oldsum) · 19 unmodified lines
2093 return csum_partial(diff, sizeof(diff), oldsum);2093 return csum_partial(diff, sizeof(diff), oldsum);
2094}2094}
2095 2095
2096static inline bool ip_vs_checksum_needed(struct sk_buff *skb)
2097{
2098 /* Checksum unnecessary or already validated? */
2099 if (skb_csum_unnecessary(skb))
2100 return false;
2101 /* Locally generated ? */
2102 if (!skb->dev)
2103 return false;
2104 return true;
2105}
2106
2107static inline bool ip_vs_checksum_common_check(struct sk_buff *skb,
2108 int offset, int proto, int af)
2109{
2110 if (!ip_vs_checksum_needed(skb))
2111 return true;
2112 /* Validate csum even for FORWARD */
2113 return !nf_checksum(skb, NF_INET_LOCAL_IN, offset, proto, af);
2114}
2115
2096/* Forget current conntrack (unconfirmed) and attach notrack entry */2116/* Forget current conntrack (unconfirmed) and attach notrack entry */
2097static inline void ip_vs_notrack(struct sk_buff *skb)2117static inline void ip_vs_notrack(struct sk_buff *skb)
2098{2118{
include/net/libeth/xsk.h+1−1
@@ -205,7 +205,7 @@ __libeth_xsk_xmit_fill_buf_md(const struct xdp_desc *xdesc, · 204 unmodified lines
205 BUILD_BUG_ON(!__builtin_constant_p(tmo == libeth_xsktmo));205 BUILD_BUG_ON(!__builtin_constant_p(tmo == libeth_xsktmo));
206 tmo = tmo == libeth_xsktmo ? &__libeth_xsktmo : tmo;206 tmo = tmo == libeth_xsktmo ? &__libeth_xsktmo : tmo;
207 207
208 xsk_tx_metadata_request(ctx.meta, tmo, &desc);208 xsk_tx_metadata_request(sq->pool, &ctx.meta, tmo, &desc);
209 209
210 return desc;210 return desc;
211}211}
include/net/netfilter/nf_conntrack_expect.h+3−0
@@ -161,6 +161,9 @@ static inline int nf_ct_expect_related(struct nf_conntrack_expect *expect, · 160 unmodified lines
161 return nf_ct_expect_related_report(expect, 0, 0, flags);161 return nf_ct_expect_related_report(expect, 0, 0, flags);
162}162}
163 163
164int nf_ct_expect_related_pair(struct nf_conntrack_expect *expect[],
165 unsigned int flag);
166
164struct nf_conn_help;167struct nf_conn_help;
165void nf_ct_expectation_gc(struct nf_conn_help *master_help);168void nf_ct_expectation_gc(struct nf_conn_help *master_help);
166 169
include/net/netfilter/nf_tables.h+3−1
@@ -1294,6 +1294,7 @@ static inline void nft_use_inc_restore(u32 *use) · 1293 unmodified lines
1294 * @sets: sets in the table1294 * @sets: sets in the table
1295 * @objects: stateful objects in the table1295 * @objects: stateful objects in the table
1296 * @flowtables: flow tables in the table1296 * @flowtables: flow tables in the table
1297 * @objname_ht: hashtable for objects lookup by name
1297 * @hgenerator: handle generator state1298 * @hgenerator: handle generator state
1298 * @handle: table handle1299 * @handle: table handle
1299 * @use: number of chain references to this table1300 * @use: number of chain references to this table
@@ -1313,6 +1314,7 @@ struct nft_table { · 13 unmodified lines
1313 struct list_head sets;1314 struct list_head sets;
1314 struct list_head objects;1315 struct list_head objects;
1315 struct list_head flowtables;1316 struct list_head flowtables;
1317 struct rhltable objname_ht;
1316 u64 hgenerator;1318 u64 hgenerator;
1317 u64 handle;1319 u64 handle;
1318 u32 use;1320 u32 use;
@@ -1400,7 +1402,7 @@ static inline void *nft_obj_data(const struct nft_object *obj) · 81 unmodified lines
1400#define nft_expr_obj(expr) *((struct nft_object **)nft_expr_priv(expr))1402#define nft_expr_obj(expr) *((struct nft_object **)nft_expr_priv(expr))
1401 1403
1402struct nft_object *nft_obj_lookup(const struct net *net,1404struct nft_object *nft_obj_lookup(const struct net *net,
1403 const struct nft_table *table,1405 struct nft_table *table,
1404 const struct nlattr *nla, u32 objtype,1406 const struct nlattr *nla, u32 objtype,
1405 u8 genmask);1407 u8 genmask);
1406 1408
include/net/sch_generic.h+1−0
@@ -99,6 +99,7 @@ struct Qdisc { · 98 unmodified lines
99 struct hlist_node hash;99 struct hlist_node hash;
100 u32 handle;100 u32 handle;
101 u32 parent;101 u32 parent;
102 int depth;
102 103
103 struct netdev_queue *dev_queue;104 struct netdev_queue *dev_queue;
104 105
include/net/xdp_sock.h+6−40
@@ -80,6 +80,7 @@ struct xdp_sock { · 79 unmodified lines
80 * call of __xsk_generic_xmit().80 * call of __xsk_generic_xmit().
81 */81 */
82 struct sk_buff *skb;82 struct sk_buff *skb;
83 bool drain_cont;
83 84
84 struct list_head map_list;85 struct list_head map_list;
85 /* Protects map_list */86 /* Protects map_list */
@@ -140,45 +141,16 @@ INDIRECT_CALLABLE_DECLARE(void xsk_destruct_skb(struct sk_buff *)); · 54 unmodified lines
140static inline void xsk_tx_metadata_to_compl(struct xsk_tx_metadata *meta,141static inline void xsk_tx_metadata_to_compl(struct xsk_tx_metadata *meta,
141 struct xsk_tx_metadata_compl *compl)142 struct xsk_tx_metadata_compl *compl)
142{143{
143 if (!meta)144 compl->tx_timestamp = NULL;
144 return;
145 145
146 if (meta->flags & XDP_TXMD_FLAGS_TIMESTAMP)
147 compl->tx_timestamp = &meta->completion.tx_timestamp;
148 else
149 compl->tx_timestamp = NULL;
150}
151
152/**
153 * xsk_tx_metadata_request - Evaluate AF_XDP TX metadata at submission
154 * and call appropriate xsk_tx_metadata_ops operation.
155 * @meta: pointer to AF_XDP metadata area
156 * @ops: pointer to struct xsk_tx_metadata_ops
157 * @priv: pointer to driver-private aread
158 *
159 * This function should be called by the networking device when
160 * it prepares AF_XDP egress packet.
161 */
162static inline void xsk_tx_metadata_request(const struct xsk_tx_metadata *meta,
163 const struct xsk_tx_metadata_ops *ops,
164 void *priv)
165{
166 if (!meta)146 if (!meta)
167 return;147 return;
168 148
169 if (ops->tmo_request_launch_time)149 /* we can only arrive here if the completion timestamp has been
170 if (meta->flags & XDP_TXMD_FLAGS_LAUNCH_TIME)150 * requested via XDP_TXMD_FLAGS_TIMESTAMP, see xsk_tx_metadata_request
171 ops->tmo_request_launch_time(meta->request.launch_time,151 */
172 priv);
173
174 if (ops->tmo_request_timestamp)
175 if (meta->flags & XDP_TXMD_FLAGS_TIMESTAMP)
176 ops->tmo_request_timestamp(priv);
177 152
178 if (ops->tmo_request_checksum)153 compl->tx_timestamp = &meta->completion.tx_timestamp;
179 if (meta->flags & XDP_TXMD_FLAGS_CHECKSUM)
180 ops->tmo_request_checksum(meta->request.csum_start,
181 meta->request.csum_offset, priv);
182}154}
183 155
184/**156/**
@@ -230,12 +202,6 @@ static inline void xsk_tx_metadata_to_compl(struct xsk_tx_metadata *meta, · 45 unmodified lines
230{202{
231}203}
232 204
233static inline void xsk_tx_metadata_request(struct xsk_tx_metadata *meta,
234 const struct xsk_tx_metadata_ops *ops,
235 void *priv)
236{
237}
238
239static inline void xsk_tx_metadata_complete(struct xsk_tx_metadata_compl *compl,205static inline void xsk_tx_metadata_complete(struct xsk_tx_metadata_compl *compl,
240 const struct xsk_tx_metadata_ops *ops,206 const struct xsk_tx_metadata_ops *ops,
241 void *priv)207 void *priv)
include/net/xdp_sock_drv.h+66−11
@@ -245,7 +245,7 @@ static inline void *xsk_buff_raw_get_data(struct xsk_buff_pool *pool, u64 addr) · 244 unmodified lines
245 * details.245 * details.
246 *246 *
247 * Return: new &xdp_desc_ctx struct containing desc's DMA address and metadata247 * Return: new &xdp_desc_ctx struct containing desc's DMA address and metadata
248 * pointer, if it is present and valid (initialized to %NULL otherwise).248 * pointer, if it is present (initialized to %NULL otherwise).
249 */249 */
250static inline struct xdp_desc_ctx250static inline struct xdp_desc_ctx
251xsk_buff_raw_get_ctx(const struct xsk_buff_pool *pool, u64 addr)251xsk_buff_raw_get_ctx(const struct xsk_buff_pool *pool, u64 addr)
@@ -260,24 +260,70 @@ xsk_buff_raw_get_ctx(const struct xsk_buff_pool *pool, u64 addr) · 8 unmodified lines
260 0)260 0)
261 261
262static inline bool262static inline bool
263xsk_buff_valid_tx_metadata(const struct xsk_tx_metadata *meta)263xsk_buff_valid_tx_metadata(const struct xsk_buff_pool *pool,
264 const struct xsk_tx_metadata *meta, u64 *flags)
264{265{
265 return !(meta->flags & ~XDP_TXMD_FLAGS_VALID);266 *flags = READ_ONCE(meta->flags);
267 if (*flags & XDP_TXMD_FLAGS_LAUNCH_TIME)
268 if (pool->tx_metadata_len <
269 offsetofend(struct xsk_tx_metadata, request.launch_time))
270 return false;
271 return !(*flags & ~XDP_TXMD_FLAGS_VALID);
272}
273
274/**
275 * xsk_tx_metadata_request - Evaluate AF_XDP TX metadata at submission
276 * and call appropriate xsk_tx_metadata_ops operation.
277 * @pool: pointer to AF_XDP buffer pool, used to validate the metadata
278 * @pmeta: pointer to pointer to AF_XDP metadata area
279 * @ops: pointer to struct xsk_tx_metadata_ops
280 * @priv: pointer to driver-private area
281 *
282 * This function should be called by the networking device when
283 * it prepares AF_XDP egress packet.
284 */
285static inline void
286xsk_tx_metadata_request(const struct xsk_buff_pool *pool,
287 struct xsk_tx_metadata **pmeta,
288 const struct xsk_tx_metadata_ops *ops, void *priv)
289{
290 const struct xsk_tx_metadata *meta = *pmeta;
291 u64 flags;
292
293 if (!meta)
294 return;
295
296 if (unlikely(!xsk_buff_valid_tx_metadata(pool, meta, &flags))) {
297 *pmeta = NULL;
298 return; /* no way to signal the error to the user */
299 }
300
301 if (ops->tmo_request_launch_time)
302 if (flags & XDP_TXMD_FLAGS_LAUNCH_TIME)
303 ops->tmo_request_launch_time(
304 READ_ONCE(meta->request.launch_time), priv);
305
306 if (ops->tmo_request_timestamp)
307 if (flags & XDP_TXMD_FLAGS_TIMESTAMP)
308 ops->tmo_request_timestamp(priv);
309
310 if (ops->tmo_request_checksum)
311 if (flags & XDP_TXMD_FLAGS_CHECKSUM)
312 ops->tmo_request_checksum(
313 READ_ONCE(meta->request.csum_start),
314 READ_ONCE(meta->request.csum_offset), priv);
315
316 if (!(flags & XDP_TXMD_FLAGS_TIMESTAMP))
317 *pmeta = NULL;
266}318}
267 319
268static inline struct xsk_tx_metadata *320static inline struct xsk_tx_metadata *
269__xsk_buff_get_metadata(const struct xsk_buff_pool *pool, void *data)321__xsk_buff_get_metadata(const struct xsk_buff_pool *pool, void *data)
270{322{
271 struct xsk_tx_metadata *meta;
272
273 if (!pool->tx_metadata_len)323 if (!pool->tx_metadata_len)
274 return NULL;324 return NULL;
275 325
276 meta = data - pool->tx_metadata_len;326 return data - pool->tx_metadata_len;
277 if (unlikely(!xsk_buff_valid_tx_metadata(meta)))
278 return NULL; /* no way to signal the error to the user */
279
280 return meta;
281}327}
282 328
283static inline struct xsk_tx_metadata *329static inline struct xsk_tx_metadata *
@@ -469,11 +515,20 @@ xsk_buff_raw_get_ctx(const struct xsk_buff_pool *pool, u64 addr) · 185 unmodified lines
469 return (struct xdp_desc_ctx){ };515 return (struct xdp_desc_ctx){ };
470}516}
471 517
472static inline bool xsk_buff_valid_tx_metadata(struct xsk_tx_metadata *meta)518static inline bool
519xsk_buff_valid_tx_metadata(const struct xsk_buff_pool *pool,
520 const struct xsk_tx_metadata *meta, u64 *flags)
473{521{
474 return false;522 return false;
475}523}
476 524
525static inline void
526xsk_tx_metadata_request(const struct xsk_buff_pool *pool,
527 struct xsk_tx_metadata **pmeta,
528 const struct xsk_tx_metadata_ops *ops, void *priv)
529{
530}
531
477static inline struct xsk_tx_metadata *532static inline struct xsk_tx_metadata *
478__xsk_buff_get_metadata(const struct xsk_buff_pool *pool, void *data)533__xsk_buff_get_metadata(const struct xsk_buff_pool *pool, void *data)
479{534{
include/net/xsk_buff_pool.h+7−2
@@ -78,6 +78,9 @@ struct xsk_buff_pool { · 77 unmodified lines
78 u32 chunk_size;78 u32 chunk_size;
79 u32 chunk_shift;79 u32 chunk_shift;
80 u32 frame_len;80 u32 frame_len;
81 u32 tx_descs_nentries;
82 u32 reclaim_descs;
83 u32 tx_zc_pending_descs;
81 u32 xdp_zc_max_segs;84 u32 xdp_zc_max_segs;
82 u8 tx_metadata_len; /* inherited from umem */85 u8 tx_metadata_len; /* inherited from umem */
83 u8 cached_need_wakeup;86 u8 cached_need_wakeup;
@@ -102,12 +105,14 @@ struct xsk_buff_pool { · 18 unmodified lines
102 105
103/* AF_XDP core. */106/* AF_XDP core. */
104struct xsk_buff_pool *xp_create_and_assign_umem(struct xdp_sock *xs,107struct xsk_buff_pool *xp_create_and_assign_umem(struct xdp_sock *xs,
105 struct xdp_umem *umem);108 struct xdp_umem *umem,
109 u32 max_segs);
106int xp_assign_dev(struct xsk_buff_pool *pool, struct net_device *dev,110int xp_assign_dev(struct xsk_buff_pool *pool, struct net_device *dev,
107 u16 queue_id, u16 flags);111 u16 queue_id, u16 flags);
108int xp_assign_dev_shared(struct xsk_buff_pool *pool, struct xdp_sock *umem_xs,112int xp_assign_dev_shared(struct xsk_buff_pool *pool, struct xdp_sock *umem_xs,
109 struct net_device *dev, u16 queue_id);113 struct net_device *dev, u16 queue_id);
110int xp_alloc_tx_descs(struct xsk_buff_pool *pool, struct xdp_sock *xs);114int xp_alloc_tx_descs(struct xsk_buff_pool *pool, struct xdp_sock *xs,
115 u32 max_segs);
111void xp_destroy(struct xsk_buff_pool *pool);116void xp_destroy(struct xsk_buff_pool *pool);
112void xp_get_pool(struct xsk_buff_pool *pool);117void xp_get_pool(struct xsk_buff_pool *pool);
113bool xp_put_pool(struct xsk_buff_pool *pool);118bool xp_put_pool(struct xsk_buff_pool *pool);
include/scsi/libsas.h+2−1
@@ -680,7 +680,6 @@ extern int sas_register_ha(struct sas_ha_struct *); · 679 unmodified lines
680extern int sas_unregister_ha(struct sas_ha_struct *);680extern int sas_unregister_ha(struct sas_ha_struct *);
681extern void sas_prep_resume_ha(struct sas_ha_struct *sas_ha);681extern void sas_prep_resume_ha(struct sas_ha_struct *sas_ha);
682extern void sas_resume_ha(struct sas_ha_struct *sas_ha);682extern void sas_resume_ha(struct sas_ha_struct *sas_ha);
683extern void sas_resume_ha_no_sync(struct sas_ha_struct *sas_ha);
684extern void sas_suspend_ha(struct sas_ha_struct *sas_ha);683extern void sas_suspend_ha(struct sas_ha_struct *sas_ha);
685 684
686int sas_phy_reset(struct sas_phy *phy, int hard_reset);685int sas_phy_reset(struct sas_phy *phy, int hard_reset);
@@ -705,6 +704,7 @@ void sas_task_abort(struct sas_task *); · 18 unmodified lines
705int sas_eh_abort_handler(struct scsi_cmnd *cmd);704int sas_eh_abort_handler(struct scsi_cmnd *cmd);
706int sas_eh_device_reset_handler(struct scsi_cmnd *cmd);705int sas_eh_device_reset_handler(struct scsi_cmnd *cmd);
707int sas_eh_target_reset_handler(struct scsi_cmnd *cmd);706int sas_eh_target_reset_handler(struct scsi_cmnd *cmd);
707enum scsi_timeout_action sas_eh_timed_out(struct scsi_cmnd *cmd);
708 708
709extern void sas_target_destroy(struct scsi_target *);709extern void sas_target_destroy(struct scsi_target *);
710extern int sas_sdev_init(struct scsi_device *);710extern int sas_sdev_init(struct scsi_device *);
@@ -743,6 +743,7 @@ void sas_notify_phy_event(struct asd_sas_phy *phy, enum phy_event event, · 32 unmodified lines
743 .this_id = -1, \743 .this_id = -1, \
744 .eh_device_reset_handler = sas_eh_device_reset_handler, \744 .eh_device_reset_handler = sas_eh_device_reset_handler, \
745 .eh_target_reset_handler = sas_eh_target_reset_handler, \745 .eh_target_reset_handler = sas_eh_target_reset_handler, \
746 .eh_timed_out = sas_eh_timed_out, \
746 .target_destroy = sas_target_destroy, \747 .target_destroy = sas_target_destroy, \
747 .ioctl = sas_ioctl, \748 .ioctl = sas_ioctl, \
748 749
include/sound/hda-sdw-bpt.h+3−2
@@ -27,7 +27,7 @@ int hda_sdw_bpt_send_async(struct device *dev, struct hdac_ext_stream *bpt_tx_st · 26 unmodified lines
27int hda_sdw_bpt_wait(struct device *dev, struct hdac_ext_stream *bpt_tx_stream,27int hda_sdw_bpt_wait(struct device *dev, struct hdac_ext_stream *bpt_tx_stream,
28 struct hdac_ext_stream *bpt_rx_stream);28 struct hdac_ext_stream *bpt_rx_stream);
29 29
30int hda_sdw_bpt_close(struct device *dev, struct hdac_ext_stream *bpt_tx_stream,30int hda_sdw_bpt_close(struct device *dev, int link_id, struct hdac_ext_stream *bpt_tx_stream,
31 struct snd_dma_buffer *dmab_tx_bdl, struct hdac_ext_stream *bpt_rx_stream,31 struct snd_dma_buffer *dmab_tx_bdl, struct hdac_ext_stream *bpt_rx_stream,
32 struct snd_dma_buffer *dmab_rx_bdl);32 struct snd_dma_buffer *dmab_rx_bdl);
33 33
@@ -58,7 +58,8 @@ static inline int hda_sdw_bpt_wait(struct device *dev, struct hdac_ext_stream *b · 24 unmodified lines
58 return -EOPNOTSUPP;58 return -EOPNOTSUPP;
59}59}
60 60
61static inline int hda_sdw_bpt_close(struct device *dev, struct hdac_ext_stream *bpt_tx_stream,61static inline int hda_sdw_bpt_close(struct device *dev, int link_id,
62 struct hdac_ext_stream *bpt_tx_stream,
62 struct snd_dma_buffer *dmab_tx_bdl,63 struct snd_dma_buffer *dmab_tx_bdl,
63 struct hdac_ext_stream *bpt_rx_stream,64 struct hdac_ext_stream *bpt_rx_stream,
64 struct snd_dma_buffer *dmab_rx_bdl)65 struct snd_dma_buffer *dmab_rx_bdl)
include/sound/sdca_fdl.h+2−0
@@ -67,6 +67,8 @@ struct fdl_state { · 66 unmodified lines
67#if IS_ENABLED(CONFIG_SND_SOC_SDCA_FDL)67#if IS_ENABLED(CONFIG_SND_SOC_SDCA_FDL)
68 68
69int sdca_fdl_alloc_state(struct sdca_interrupt *interrupt);69int sdca_fdl_alloc_state(struct sdca_interrupt *interrupt);
70void sdca_fdl_free_state(struct sdca_interrupt *interrupt);
71
70int sdca_fdl_process(struct sdca_interrupt *interrupt);72int sdca_fdl_process(struct sdca_interrupt *interrupt);
71int sdca_fdl_sync(struct device *dev, struct sdca_function_data *function,73int sdca_fdl_sync(struct device *dev, struct sdca_function_data *function,
72 struct sdca_interrupt_info *info);74 struct sdca_interrupt_info *info);
include/sound/sdca_interrupts.h+12−2
@@ -30,9 +30,12 @@ struct sdca_function_data; · 29 unmodified lines
30 * @function: Pointer to the Function that the interrupt is associated with.30 * @function: Pointer to the Function that the interrupt is associated with.
31 * @entity: Pointer to the Entity that the interrupt is associated with.31 * @entity: Pointer to the Entity that the interrupt is associated with.
32 * @control: Pointer to the Control that the interrupt is associated with.32 * @control: Pointer to the Control that the interrupt is associated with.
33 * @handler: Handler function to be called for the IRQ.
33 * @priv: Pointer to private data for use by the handler.34 * @priv: Pointer to private data for use by the handler.
35 * @free_priv: Pointer to a function that can be used to free the priv data.
34 * @irq: IRQ number allocated to this interrupt, also used internally to track36 * @irq: IRQ number allocated to this interrupt, also used internally to track
35 * the IRQ being assigned.37 * the IRQ being assigned.
38 * @early_request: Flag to indicate this IRQ was requested at bus probe time.
36 */39 */
37struct sdca_interrupt {40struct sdca_interrupt {
38 const char *name;41 const char *name;
@@ -44,10 +47,13 @@ struct sdca_interrupt { · 5 unmodified lines
44 struct sdca_function_data *function;47 struct sdca_function_data *function;
45 struct sdca_entity *entity;48 struct sdca_entity *entity;
46 struct sdca_control *control;49 struct sdca_control *control;
50 irq_handler_t handler;
47 51
48 void *priv;52 void *priv;
53 void (*free_priv)(struct sdca_interrupt *interrupt);
49 54
50 int irq;55 int irq;
56 bool early_request;
51};57};
52 58
53/**59/**
@@ -86,8 +92,12 @@ int sdca_irq_populate(struct sdca_function_data *function, · 32 unmodified lines
86void sdca_irq_cleanup(struct device *dev,92void sdca_irq_cleanup(struct device *dev,
87 struct sdca_function_data *function,93 struct sdca_function_data *function,
88 struct sdca_interrupt_info *info);94 struct sdca_interrupt_info *info);
89struct sdca_interrupt_info *sdca_irq_allocate(struct device *dev,95void sdca_irq_cleanup_late(struct device *dev,
90 struct regmap *regmap, int irq);96 struct sdca_function_data *function,
97 struct sdca_interrupt_info *info);
98
99struct sdca_interrupt_info *devm_sdca_irq_allocate(struct device *dev,
100 struct regmap *regmap, int irq);
91 101
92void sdca_irq_enable_early(struct sdca_function_data *function,102void sdca_irq_enable_early(struct sdca_function_data *function,
93 struct sdca_interrupt_info *info);103 struct sdca_interrupt_info *info);
include/sound/sdca_jack.h+3−0
@@ -28,6 +28,9 @@ struct jack_state { · 27 unmodified lines
28};28};
29 29
30int sdca_jack_alloc_state(struct sdca_interrupt *interrupt);30int sdca_jack_alloc_state(struct sdca_interrupt *interrupt);
31int sdca_jack_init_state(struct sdca_interrupt *interrupt);
32void sdca_jack_free_state(struct sdca_interrupt *interrupt);
33
31int sdca_jack_process(struct sdca_interrupt *interrupt);34int sdca_jack_process(struct sdca_interrupt *interrupt);
32int sdca_jack_set_jack(struct sdca_interrupt_info *info, struct snd_soc_jack *jack);35int sdca_jack_set_jack(struct sdca_interrupt_info *info, struct snd_soc_jack *jack);
33int sdca_jack_report(struct sdca_interrupt *interrupt);36int sdca_jack_report(struct sdca_interrupt *interrupt);
include/sound/soc-component.h+2−0
@@ -78,6 +78,7 @@ struct snd_soc_component_driver { · 77 unmodified lines
78 unsigned int num_dapm_routes;78 unsigned int num_dapm_routes;
79 79
80 int (*probe)(struct snd_soc_component *component);80 int (*probe)(struct snd_soc_component *component);
81 int (*fixup_controls)(struct snd_soc_component *component);
81 void (*remove)(struct snd_soc_component *component);82 void (*remove)(struct snd_soc_component *component);
82 int (*suspend)(struct snd_soc_component *component);83 int (*suspend)(struct snd_soc_component *component);
83 int (*resume)(struct snd_soc_component *component);84 int (*resume)(struct snd_soc_component *component);
@@ -380,6 +381,7 @@ void snd_soc_component_suspend(struct snd_soc_component *component); · 296 unmodified lines
380void snd_soc_component_resume(struct snd_soc_component *component);381void snd_soc_component_resume(struct snd_soc_component *component);
381int snd_soc_component_is_suspended(struct snd_soc_component *component);382int snd_soc_component_is_suspended(struct snd_soc_component *component);
382int snd_soc_component_probe(struct snd_soc_component *component);383int snd_soc_component_probe(struct snd_soc_component *component);
384int snd_soc_component_fixup_controls(struct snd_soc_component *component);
383void snd_soc_component_remove(struct snd_soc_component *component);385void snd_soc_component_remove(struct snd_soc_component *component);
384int snd_soc_component_of_xlate_dai_id(struct snd_soc_component *component,386int snd_soc_component_of_xlate_dai_id(struct snd_soc_component *component,
385 struct device_node *ep);387 struct device_node *ep);
include/trace/events/btrfs.h+35−0
@@ -689,6 +689,41 @@ DEFINE_EVENT(btrfs__ordered_extent, btrfs_ordered_extent_lookup_first, · 688 unmodified lines
689 TP_ARGS(inode, ordered)689 TP_ARGS(inode, ordered)
690);690);
691 691
692/*
693 * The writepage fixup worker deferred a block because this still-running
694 * ordered extent covers it.
695 */
696DEFINE_EVENT(btrfs__ordered_extent, btrfs_writepage_fixup_defer,
697
698 TP_PROTO(const struct btrfs_inode *inode,
699 const struct btrfs_ordered_extent *ordered),
700
701 TP_ARGS(inode, ordered)
702);
703
704/* The writepage fixup worker reserved space for a block and set delalloc. */
705TRACE_EVENT(btrfs_writepage_fixup_reserve,
706
707 TP_PROTO(const struct btrfs_inode *inode, u64 start, u32 len),
708
709 TP_ARGS(inode, start, len),
710
711 TP_STRUCT__entry_btrfs(
712 __field( u64, ino )
713 __field( u64, start )
714 __field( u32, len )
715 ),
716
717 TP_fast_assign_btrfs(inode->root->fs_info,
718 __entry->ino = btrfs_ino(inode);
719 __entry->start = start;
720 __entry->len = len;
721 ),
722
723 TP_printk_btrfs("ino=%llu start=%llu len=%u",
724 __entry->ino, __entry->start, __entry->len)
725);
726
692DEFINE_EVENT(btrfs__ordered_extent, btrfs_ordered_extent_split,727DEFINE_EVENT(btrfs__ordered_extent, btrfs_ordered_extent_split,
693 728
694 TP_PROTO(const struct btrfs_inode *inode,729 TP_PROTO(const struct btrfs_inode *inode,

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t