drm: Add orientation quirk for GPD Win Max
Subsystems (25)
Sasha Levin
maintainerPATCH 1/98 drm: Add orientation quirk for GPD Win Max
From: Anisse Astier <[email protected]>
[ Upstream commit 0b464ca3e0dd3cec65f28bc6d396d82f19080f69 ]
Panel is 800x1280, but mounted on a laptop form factor, sideways.
--- drivers/gpu/drm/drm_panel_orientation_quirks.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/gpu/drm/drm_panel_orientation_quirks.c +6 -0
@@ -166,6 +166,12 @@ static const struct dmi_system_id orientation_data[] = { DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "MicroPC"), }, .driver_data = (void *)&lcd720x1280_rightside_up, + }, { /* GPD Win Max */ + .matches = { +DMI_EXACT_MATCH (DMI_SYS_VENDOR ,"GPD" ), + DMI_EXACT_MATCH(DMI_PRODUCT_NAME, "G1619-01"), + }, + .driver_data = (void *)&lcd800x1280_rightside_up, }, { /** GPD Pocket, note that the the DMI data is less generic then * it seems, devices with a board-vendor of "AMI Corporation"
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 2/98 ath5k: fix OOB in ath5k_eeprom_read_pcal_info_5111
From: Zekun Shen <[email protected]>
[ Upstream commit 564d4eceb97eaf381dd6ef6470b06377bb50c95a ]
The bug was found during fuzzing. Stacktrace locates it in ath5k_eeprom_convert_pcal_info_5111.
When none of the curve is selected in the loop, idx can go up to AR5K_EEPROM_N_PD_CURVES. The line makes pd out of bound. pd = &chinfo[pier].pd_curves[idx];
There are many OOB writes using pd later in the code. So I added a sanity check for idx. Checks for other loops involving AR5K_EEPROM_N_PD_CURVES are not needed as the loop index is not used outside the loops.
The patch is NOT tested with real device.
The following is the fuzzing report
BUG: KASAN: slab-out-of-bounds in ath5k_eeprom_read_pcal_info_5111+0x126a/0x1390 [ath5k] Write of size 1 at addr ffff8880174a4d60 by task modprobe/214 CPU: 0 PID: 214 Comm: modprobe Not tainted 5.6.0 #1 Call Trace: dump_stack+0x76/0xa0 print_address_description.constprop.0+0x16/0x200 ? ath5k_eeprom_read_pcal_info_5111+0x126a/0x1390 [ath5k] ? ath5k_eeprom_read_pcal_info_5111+0x126a/0x1390 [ath5k] __kasan_report.cold+0x37/0x7c ? ath5k_eeprom_read_pcal_info_5111+0x126a/0x1390 [ath5k] kasan_report+0xe/0x20 ath5k_eeprom_read_pcal_info_5111+0x126a/0x1390 [ath5k] ? apic_timer_interrupt+0xa/0x20 ? ath5k_eeprom_init_11a_pcal_freq+0xbc0/0xbc0 [ath5k] ? ath5k_pci_eeprom_read+0x228/0x3c0 [ath5k] ath5k_eeprom_init+0x2513/0x6290 [ath5k] ? ath5k_eeprom_init_11a_pcal_freq+0xbc0/0xbc0 [ath5k] ? usleep_range+0xb8/0x100 ? apic_timer_interrupt+0xa/0x20 ? ath5k_eeprom_read_pcal_info_2413+0x2f20/0x2f20 [ath5k] ath5k_hw_init+0xb60/0x1970 [ath5k] ath5k_init_ah+0x6fe/0x2530 [ath5k] ? kasprintf+0xa6/0xe0 ? ath5k_stop+0x140/0x140 [ath5k] ? _dev_notice+0xf6/0xf6 ? apic_timer_interrupt+0xa/0x20 ath5k_pci_probe.cold+0x29a/0x3d6 [ath5k] ? ath5k_pci_eeprom_read+0x3c0/0x3c0 [ath5k] ? mutex_lock+0x89/0xd0 ? ath5k_pci_eeprom_read+0x3c0/0x3c0 [ath5k] local_pci_probe+0xd3/0x160 pci_device_probe+0x23f/0x3e0 ? pci_device_remove+0x280/0x280 ? pci_device_remove+0x280/0x280 really_probe+0x209/0x5d0
--- drivers/net/wireless/ath/ath5k/eeprom.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/net/wireless/ath/ath5k/eeprom.c +3 -0
@@ -746,6 +746,9 @@ ath5k_eeprom_convert_pcal_info_5111(struct ath5k_hw *ah, int mode, } } +if (idx ==AR5K_EEPROM_N_PD_CURVES ) + goto err_out; + ee->ee_pd_gains[mode] =1 ; pd = &chinfo[pier].pd_curves[idx];
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 3/98 drm/amd/display: Add signal type check when verify stream backends same
In reply to Sasha LevinFrom: Dale Zhao <[email protected]>
[ Upstream commit 047db281c026de5971cedb5bb486aa29bd16a39d ]
[Why]
For allow eDP hot-plug feature, the stream signal may change to VIRTUAL when plug-out and back to eDP when plug-in. OS will still setPathMode with same timing for each plugging, but eDP gets no stream update as we don't check signal type changing back as keeping it VIRTUAL. It's also unsafe for future cases that stream signal is switched with same timing.
[How]
Check stream signal type change include previous HDMI signal case.
--- drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/amd/display/dc/core/dc_resource.c +3 -0
@@ -1599,6 +1599,9 @@ static bool are_stream_backends_same(if (is_timing_changed (stream_a, stream_b))return false; +if (stream_a->signal != stream_b->signal) +return false; +if (stream_a->dpms_off != stream_b->dpms_off)return false;
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 4/98 drm/amd/amdgpu/amdgpu_cs: fix refcount leak of a dma_fence obj
In reply to Sasha LevinFrom: Xin Xiong <[email protected]>
[ Upstream commit dfced44f122c500004a48ecc8db516bb6a295a1b ]
This issue takes place in an error path in amdgpu_cs_fence_to_handle_ioctl(). When info->in.what falls into default case, the function simply returns -EINVAL, forgetting to decrement the reference count of a dma_fence obj, which is bumped earlier by amdgpu_cs_get_fence(). This may result in reference count leaks.
Fix it by decreasing the refcount of specific object before returning the error code.
--- drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 1 + 1 file changed, 1 insertion(+)
drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +1 -0
@@ -1508,6 +1508,7 @@ int amdgpu_cs_fence_to_handle_ioctl(struct drm_device *dev, void *data,return 0 ;default : +dma_fence_put (fence);return -EINVAL ; } }
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 5/98 drm/amd/display: Fix memory leak
In reply to Sasha LevinFrom: Yongzhi Liu <[email protected]>
[ Upstream commit 5d5c6dba2b43e28845d7d7ed32a36802329a5f52 ]
[why]
Resource release is needed on the error handling path to prevent memory leak.
[how]
Fix this by adding kfree on the error handling path.
--- .../amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 80 ++++++++++++++----- 1 file changed, 60 insertions(+), 20 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +60 -20
@@ -229,8 +229,10 @@ static ssize_t dp_link_settings_read(struct file *f, char __user *buf,break ; r =put_user (*(rd_buf + result), buf); -if (r) +if (r) { +kfree (rd_buf);return r;/* r = -EFAULT */ + } buf +=1 ; size -=1 ;
@@ -388,8 +390,10 @@ static ssize_t dp_phy_settings_read(struct file *f, char __user *buf,break ; r =put_user ((*(rd_buf + result)), buf); -if (r) +if (r) { +kfree (rd_buf);return r;/* r = -EFAULT */ + } buf +=1 ; size -=1 ;
@@ -1316,8 +1320,10 @@ static ssize_t dp_dsc_clock_en_read(struct file *f, char __user *buf,break ; } -if (!pipe_ctx) +if (!pipe_ctx) { +kfree (rd_buf);return -ENXIO ; + } dsc = pipe_ctx->stream_res.dsc;if (dsc)
@@ -1333,8 +1339,10 @@ static ssize_t dp_dsc_clock_en_read(struct file *f, char __user *buf,break ; r =put_user (*(rd_buf + result), buf); -if (r) +if (r) { +kfree (rd_buf);return r;/* r = -EFAULT */ + } buf +=1 ; size -=1 ;
@@ -1503,8 +1511,10 @@ static ssize_t dp_dsc_slice_width_read(struct file *f, char __user *buf,break ; } -if (!pipe_ctx) +if (!pipe_ctx) { +kfree (rd_buf);return -ENXIO ; + } dsc = pipe_ctx->stream_res.dsc;if (dsc)
@@ -1520,8 +1530,10 @@ static ssize_t dp_dsc_slice_width_read(struct file *f, char __user *buf,break ; r =put_user (*(rd_buf + result), buf); -if (r) +if (r) { +kfree (rd_buf);return r;/* r = -EFAULT */ + } buf +=1 ; size -=1 ;
@@ -1688,8 +1700,10 @@ static ssize_t dp_dsc_slice_height_read(struct file *f, char __user *buf,break ; } -if (!pipe_ctx) +if (!pipe_ctx) { +kfree (rd_buf);return -ENXIO ; + } dsc = pipe_ctx->stream_res.dsc;if (dsc)
@@ -1705,8 +1719,10 @@ static ssize_t dp_dsc_slice_height_read(struct file *f, char __user *buf,break ; r =put_user (*(rd_buf + result), buf); -if (r) +if (r) { +kfree (rd_buf);return r;/* r = -EFAULT */ + } buf +=1 ; size -=1 ;
@@ -1869,8 +1885,10 @@ static ssize_t dp_dsc_bits_per_pixel_read(struct file *f, char __user *buf,break ; } -if (!pipe_ctx) +if (!pipe_ctx) { +kfree (rd_buf);return -ENXIO ; + } dsc = pipe_ctx->stream_res.dsc;if (dsc)
@@ -1886,8 +1904,10 @@ static ssize_t dp_dsc_bits_per_pixel_read(struct file *f, char __user *buf,break ; r =put_user (*(rd_buf + result), buf); -if (r) +if (r) { +kfree (rd_buf);return r;/* r = -EFAULT */ + } buf +=1 ; size -=1 ;
@@ -2045,8 +2065,10 @@ static ssize_t dp_dsc_pic_width_read(struct file *f, char __user *buf,break ; } -if (!pipe_ctx) +if (!pipe_ctx) { +kfree (rd_buf);return -ENXIO ; + } dsc = pipe_ctx->stream_res.dsc;if (dsc)
@@ -2062,8 +2084,10 @@ static ssize_t dp_dsc_pic_width_read(struct file *f, char __user *buf,break ; r =put_user (*(rd_buf + result), buf); -if (r) +if (r) { +kfree (rd_buf);return r;/* r = -EFAULT */ + } buf +=1 ; size -=1 ;
@@ -2102,8 +2126,10 @@ static ssize_t dp_dsc_pic_height_read(struct file *f, char __user *buf,break ; } -if (!pipe_ctx) +if (!pipe_ctx) { +kfree (rd_buf);return -ENXIO ; + } dsc = pipe_ctx->stream_res.dsc;if (dsc)
@@ -2119,8 +2145,10 @@ static ssize_t dp_dsc_pic_height_read(struct file *f, char __user *buf,break ; r =put_user (*(rd_buf + result), buf); -if (r) +if (r) { +kfree (rd_buf);return r;/* r = -EFAULT */ + } buf +=1 ; size -=1 ;
@@ -2174,8 +2202,10 @@ static ssize_t dp_dsc_chunk_size_read(struct file *f, char __user *buf,break ; } -if (!pipe_ctx) +if (!pipe_ctx) { +kfree (rd_buf);return -ENXIO ; + } dsc = pipe_ctx->stream_res.dsc;if (dsc)
@@ -2191,8 +2221,10 @@ static ssize_t dp_dsc_chunk_size_read(struct file *f, char __user *buf,break ; r =put_user (*(rd_buf + result), buf); -if (r) +if (r) { +kfree (rd_buf);return r;/* r = -EFAULT */ + } buf +=1 ; size -=1 ;
@@ -2246,8 +2278,10 @@ static ssize_t dp_dsc_slice_bpg_offset_read(struct file *f, char __user *buf,break ; } -if (!pipe_ctx) +if (!pipe_ctx) { +kfree (rd_buf);return -ENXIO ; + } dsc = pipe_ctx->stream_res.dsc;if (dsc)
@@ -2263,8 +2297,10 @@ static ssize_t dp_dsc_slice_bpg_offset_read(struct file *f, char __user *buf,break ; r =put_user (*(rd_buf + result), buf); -if (r) +if (r) { +kfree (rd_buf);return r;/* r = -EFAULT */ + } buf +=1 ; size -=1 ;
@@ -3254,8 +3290,10 @@ static ssize_t dcc_en_bits_read( dc->hwss.get_dcc_en_bits (dc, dcc_en_bits); rd_buf =kcalloc (rd_buf_size,sizeof (char ),GFP_KERNEL ); -if (!rd_buf) +if (!rd_buf) { +kfree (dcc_en_bits);return -ENOMEM ; + }for (i =0 ; i < num_pipes; i++) offset += snprintf(rd_buf + offset, rd_buf_size - offset,
@@ -3268,8 +3306,10 @@ static ssize_t dcc_en_bits_read(if (*pos >= rd_buf_size)break ; r =put_user (*(rd_buf + result), buf); -if (r) +if (r) { +kfree (rd_buf);return r;/* r = -EFAULT */ + } buf +=1 ; size -=1 ; *pos +=1 ;
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 6/98 drm/amd/display: Use PSR version selected during set_psr_caps
In reply to Sasha LevinFrom: Nicholas Kazlauskas <[email protected]>
[ Upstream commit b80ddeb29d9df449f875f0b6f5de08d7537c02b8 ]
[Why]
If the DPCD caps specifies a PSR version newer than PSR_VERSION_1 then we fallback to using PSR_VERSION_1 in amdgpu_dm_set_psr_caps.
This gets overriden with the raw DPCD value in amdgpu_dm_link_setup_psr, which can result in DMCUB hanging if we pass in an unsupported PSR version number.
[How]
Fix the hang by using link->psr_settings.psr_version directly during amdgpu_dm_link_setup_psr.
--- drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c +2 -4
@@ -74,10 +74,8 @@ bool amdgpu_dm_link_setup_psr(struct dc_stream_state *stream) link = stream->link; - psr_config.psr_version = link->dpcd_caps.psr_caps.psr_version; - -if (psr_config.psr_version >0 ) { - psr_config.psr_exit_link_training_required =0x1 ; +if (link->psr_settings.psr_version !=DC_PSR_VERSION_UNSUPPORTED ) { + psr_config.psr_version = link->psr_settings.psr_version; psr_config.psr_frame_capture_indication_req =0 ; psr_config.psr_rfb_setup_time =0x37 ; psr_config.psr_sdp_transmit_line_num_deadline =0x20 ;
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 7/98 usb: gadget: tegra-xudc: Do not program SPARAM
In reply to Sasha LevinFrom: Wayne Chang <[email protected]>
[ Upstream commit 62fb61580eb48fc890b7bc9fb5fd263367baeca8 ]
According to the Tegra Technical Reference Manual, SPARAM is a read-only register and should not be programmed in the driver.
The change removes the wrong SPARAM usage.
--- drivers/usb/gadget/udc/tegra-xudc.c | 8 -------- 1 file changed, 8 deletions(-)
drivers/usb/gadget/udc/tegra-xudc.c +0 -8
@@ -32,9 +32,6 @@#include <linux/workqueue.h> /* XUSB_DEV registers */ -#define SPARAM 0x000 -#define SPARAM_ERSTMAX_MASK GENMASK(20, 16) -#define SPARAM_ERSTMAX (x) (((x) << 16) & SPARAM_ERSTMAX_MASK)#define DB 0x004#define DB_TARGET_MASK GENMASK(15, 8)#define DB_TARGET (x) (((x) << 8) & DB_TARGET_MASK)
@@ -3295,11 +3292,6 @@ static void tegra_xudc_init_event_ring(struct tegra_xudc *xudc)unsigned int i;u32 val; - val =xudc_readl (xudc,SPARAM ); - val &= ~(SPARAM_ERSTMAX_MASK ); - val |=SPARAM_ERSTMAX (XUDC_NR_EVENT_RINGS ); -xudc_writel (xudc, val,SPARAM ); -for (i =0 ; i <ARRAY_SIZE (xudc->event_ring); i++) {memset (xudc->event_ring[i],0 ,XUDC_EVENT_RING_SIZE *sizeof (*xudc->event_ring[i]));
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 8/98 usb: gadget: tegra-xudc: Fix control endpoint's definitions
In reply to Sasha LevinFrom: Wayne Chang <[email protected]>
[ Upstream commit 7bd42fb95eb4f98495ccadf467ad15124208ec49 ]
According to the Tegra Technical Reference Manual, the seq_num field of control endpoint is not [31:24] but [31:27]. Bit 24 is reserved and bit 26 is splitxstate.
The change fixes the wrong control endpoint's definitions.
--- drivers/usb/gadget/udc/tegra-xudc.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/usb/gadget/udc/tegra-xudc.c +10 -2
@@ -272,8 +272,10 @@ BUILD_EP_CONTEXT_RW(deq_hi, deq_hi, 0, 0xffffffff) BUILD_EP_CONTEXT_RW(avg_trb_len, tx_info, 0, 0xffff) BUILD_EP_CONTEXT_RW(max_esit_payload, tx_info, 16, 0xffff) BUILD_EP_CONTEXT_RW(edtla, rsvd[0], 0, 0xffffff) -BUILD_EP_CONTEXT_RW(seq_num, rsvd[0], 24, 0xff) +BUILD_EP_CONTEXT_RW(rsvd, rsvd[0], 24, 0x1) BUILD_EP_CONTEXT_RW(partial_td, rsvd[0], 25, 0x1) +BUILD_EP_CONTEXT_RW(splitxstate, rsvd[0], 26, 0x1) +BUILD_EP_CONTEXT_RW(seq_num, rsvd[0], 27, 0x1f) BUILD_EP_CONTEXT_RW(cerrcnt, rsvd[1], 18, 0x3) BUILD_EP_CONTEXT_RW(data_offset, rsvd[2], 0, 0x1ffff)BUILD_EP_CONTEXT_RW (numtrbs, rsvd[2 ],22 ,0x1f )
@@ -1554,6 +1556,9 @@ static int __tegra_xudc_ep_set_halt(struct tegra_xudc_ep *ep, bool halt)ep_reload (xudc, ep->index);ep_ctx_write_state (ep->context,EP_STATE_RUNNING ); +ep_ctx_write_rsvd (ep->context,0 ); +ep_ctx_write_partial_td (ep->context,0 ); +ep_ctx_write_splitxstate (ep->context,0 );ep_ctx_write_seq_num (ep->context,0 );ep_reload (xudc, ep->index);
@@ -2809,7 +2814,10 @@ static void tegra_xudc_reset(struct tegra_xudc *xudc) xudc->setup_seq_num =0 ; xudc->queued_setup_packet = false; -ep_ctx_write_seq_num (ep0->context, xudc->setup_seq_num); +ep_ctx_write_rsvd (ep0->context,0 ); +ep_ctx_write_partial_td (ep0->context,0 ); +ep_ctx_write_splitxstate (ep0->context,0 ); +ep_ctx_write_seq_num (ep0->context,0 ); deq_ptr =trb_virt_to_phys (ep0, &ep0->transfer_ring[ep0->deq_ptr]);
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 9/98 usb: cdnsp: fix cdnsp_decode_trb function to properly handle ret value
In reply to Sasha LevinFrom: Pawel Laszczak <[email protected]>
[ Upstream commit 03db9289b5ab59437e42a111a34545a7cedb5190 ]
Variable ret in function cdnsp_decode_trb is initialized but not used. To fix this compiler warning patch adds checking whether the data buffer has not been overflowed.
--- drivers/usb/cdns3/cdnsp-debug.h | 305 ++++++++++++++++---------------- 1 file changed, 154 insertions(+), 151 deletions(-)
drivers/usb/cdns3/cdnsp-debug.h +154 -151
@@ -182,208 +182,211 @@ static inline const char *cdnsp_decode_trb(char *str, size_t size, u32 field0,int ep_id =TRB_TO_EP_INDEX (field3) -1 ;int type =TRB_FIELD_TO_TYPE (field3);unsigned int ep_num; -int ret =0 ; +int ret;u32 temp; ep_num =DIV_ROUND_UP (ep_id,2 );switch (type) {case TRB_LINK : - ret +=snprintf (str, size, -"LINK %08x%08x intr %ld type '%s' flags %c:%c:%c:%c" , - field1, field0,GET_INTR_TARGET (field2), -cdnsp_trb_type_string (type), - field3 &TRB_IOC ?'I' :'i' , - field3 &TRB_CHAIN ?'C' :'c' , - field3 &TRB_TC ?'T' :'t' , - field3 &TRB_CYCLE ?'C' :'c' ); + ret =snprintf (str, size, +"LINK %08x%08x intr %ld type '%s' flags %c:%c:%c:%c" , + field1, field0,GET_INTR_TARGET (field2), +cdnsp_trb_type_string (type), + field3 &TRB_IOC ?'I' :'i' , + field3 &TRB_CHAIN ?'C' :'c' , + field3 &TRB_TC ?'T' :'t' , + field3 &TRB_CYCLE ?'C' :'c' );break ;case TRB_TRANSFER :case TRB_COMPLETION :case TRB_PORT_STATUS :case TRB_HC_EVENT : - ret +=snprintf (str, size, -"ep%d%s(%d) type '%s' TRB %08x%08x status '%s'" -" len %ld slot %ld flags %c:%c" , - ep_num, ep_id %2 ?"out" :"in" , -TRB_TO_EP_INDEX (field3), -cdnsp_trb_type_string (type), field1, field0, -cdnsp_trb_comp_code_string (GET_COMP_CODE (field2)), -EVENT_TRB_LEN (field2),TRB_TO_SLOT_ID (field3), - field3 &EVENT_DATA ?'E' :'e' , - field3 &TRB_CYCLE ?'C' :'c' ); + ret =snprintf (str, size, +"ep%d%s(%d) type '%s' TRB %08x%08x status '%s'" +" len %ld slot %ld flags %c:%c" , + ep_num, ep_id %2 ?"out" :"in" , +TRB_TO_EP_INDEX (field3), +cdnsp_trb_type_string (type), field1, field0, +cdnsp_trb_comp_code_string (GET_COMP_CODE (field2)), +EVENT_TRB_LEN (field2),TRB_TO_SLOT_ID (field3), + field3 &EVENT_DATA ?'E' :'e' , + field3 &TRB_CYCLE ?'C' :'c' );break ;case TRB_MFINDEX_WRAP : - ret +=snprintf (str, size,"%s: flags %c" , -cdnsp_trb_type_string (type), - field3 &TRB_CYCLE ?'C' :'c' ); + ret =snprintf (str, size,"%s: flags %c" , +cdnsp_trb_type_string (type), + field3 &TRB_CYCLE ?'C' :'c' );break ;case TRB_SETUP : - ret +=snprintf (str, size, -"type '%s' bRequestType %02x bRequest %02x " -"wValue %02x%02x wIndex %02x%02x wLength %d " -"length %ld TD size %ld intr %ld Setup ID %ld " -"flags %c:%c:%c" , -cdnsp_trb_type_string (type), - field0 &0xff , - (field0 &0xff00 ) >>8 , - (field0 &0xff000000 ) >>24 , - (field0 &0xff0000 ) >>16 , - (field1 &0xff00 ) >>8 , - field1 &0xff , - (field1 &0xff000000 ) >>16 | - (field1 &0xff0000 ) >>16 , -TRB_LEN (field2),GET_TD_SIZE (field2), -GET_INTR_TARGET (field2), -TRB_SETUPID_TO_TYPE (field3), - field3 &TRB_IDT ?'D' :'d' , - field3 &TRB_IOC ?'I' :'i' , - field3 &TRB_CYCLE ?'C' :'c' ); + ret =snprintf (str, size, +"type '%s' bRequestType %02x bRequest %02x " +"wValue %02x%02x wIndex %02x%02x wLength %d " +"length %ld TD size %ld intr %ld Setup ID %ld " +"flags %c:%c:%c" , +cdnsp_trb_type_string (type), + field0 &0xff , + (field0 &0xff00 ) >>8 , + (field0 &0xff000000 ) >>24 , + (field0 &0xff0000 ) >>16 , + (field1 &0xff00 ) >>8 , + field1 &0xff , + (field1 &0xff000000 ) >>16 | + (field1 &0xff0000 ) >>16 , +TRB_LEN (field2),GET_TD_SIZE (field2), +GET_INTR_TARGET (field2), +TRB_SETUPID_TO_TYPE (field3), + field3 &TRB_IDT ?'D' :'d' , + field3 &TRB_IOC ?'I' :'i' , + field3 &TRB_CYCLE ?'C' :'c' );break ;case TRB_DATA : - ret +=snprintf (str, size, -"type '%s' Buffer %08x%08x length %ld TD size %ld " -"intr %ld flags %c:%c:%c:%c:%c:%c:%c" , -cdnsp_trb_type_string (type), - field1, field0,TRB_LEN (field2), -GET_TD_SIZE (field2), -GET_INTR_TARGET (field2), - field3 &TRB_IDT ?'D' :'i' , - field3 &TRB_IOC ?'I' :'i' , - field3 &TRB_CHAIN ?'C' :'c' , - field3 &TRB_NO_SNOOP ?'S' :'s' , - field3 &TRB_ISP ?'I' :'i' , - field3 &TRB_ENT ?'E' :'e' , - field3 &TRB_CYCLE ?'C' :'c' ); + ret =snprintf (str, size, +"type '%s' Buffer %08x%08x length %ld TD size %ld " +"intr %ld flags %c:%c:%c:%c:%c:%c:%c" , +cdnsp_trb_type_string (type), + field1, field0,TRB_LEN (field2), +GET_TD_SIZE (field2), +GET_INTR_TARGET (field2), + field3 &TRB_IDT ?'D' :'i' , + field3 &TRB_IOC ?'I' :'i' , + field3 &TRB_CHAIN ?'C' :'c' , + field3 &TRB_NO_SNOOP ?'S' :'s' , + field3 &TRB_ISP ?'I' :'i' , + field3 &TRB_ENT ?'E' :'e' , + field3 &TRB_CYCLE ?'C' :'c' );break ;case TRB_STATUS : - ret +=snprintf (str, size, -"Buffer %08x%08x length %ld TD size %ld intr" -"%ld type '%s' flags %c:%c:%c:%c" , - field1, field0,TRB_LEN (field2), -GET_TD_SIZE (field2), -GET_INTR_TARGET (field2), -cdnsp_trb_type_string (type), - field3 &TRB_IOC ?'I' :'i' , - field3 &TRB_CHAIN ?'C' :'c' , - field3 &TRB_ENT ?'E' :'e' , - field3 &TRB_CYCLE ?'C' :'c' ); + ret =snprintf (str, size, +"Buffer %08x%08x length %ld TD size %ld intr" +"%ld type '%s' flags %c:%c:%c:%c" , + field1, field0,TRB_LEN (field2), +GET_TD_SIZE (field2), +GET_INTR_TARGET (field2), +cdnsp_trb_type_string (type), + field3 &TRB_IOC ?'I' :'i' , + field3 &TRB_CHAIN ?'C' :'c' , + field3 &TRB_ENT ?'E' :'e' , + field3 &TRB_CYCLE ?'C' :'c' );break ;case TRB_NORMAL :case TRB_ISOC :case TRB_EVENT_DATA :case TRB_TR_NOOP : - ret +=snprintf (str, size, -"type '%s' Buffer %08x%08x length %ld " -"TD size %ld intr %ld " -"flags %c:%c:%c:%c:%c:%c:%c:%c:%c" , -cdnsp_trb_type_string (type), - field1, field0,TRB_LEN (field2), -GET_TD_SIZE (field2), -GET_INTR_TARGET (field2), - field3 &TRB_BEI ?'B' :'b' , - field3 &TRB_IDT ?'T' :'t' , - field3 &TRB_IOC ?'I' :'i' , - field3 &TRB_CHAIN ?'C' :'c' , - field3 &TRB_NO_SNOOP ?'S' :'s' , - field3 &TRB_ISP ?'I' :'i' , - field3 &TRB_ENT ?'E' :'e' , - field3 &TRB_CYCLE ?'C' :'c' , - !(field3 &TRB_EVENT_INVALIDATE ) ?'V' :'v' ); + ret =snprintf (str, size, +"type '%s' Buffer %08x%08x length %ld " +"TD size %ld intr %ld " +"flags %c:%c:%c:%c:%c:%c:%c:%c:%c" , +cdnsp_trb_type_string (type), + field1, field0,TRB_LEN (field2), +GET_TD_SIZE (field2), +GET_INTR_TARGET (field2), + field3 &TRB_BEI ?'B' :'b' , + field3 &TRB_IDT ?'T' :'t' , + field3 &TRB_IOC ?'I' :'i' , + field3 &TRB_CHAIN ?'C' :'c' , + field3 &TRB_NO_SNOOP ?'S' :'s' , + field3 &TRB_ISP ?'I' :'i' , + field3 &TRB_ENT ?'E' :'e' , + field3 &TRB_CYCLE ?'C' :'c' , + !(field3 &TRB_EVENT_INVALIDATE ) ?'V' :'v' );break ;case TRB_CMD_NOOP :case TRB_ENABLE_SLOT : - ret +=snprintf (str, size,"%s: flags %c" , -cdnsp_trb_type_string (type), - field3 &TRB_CYCLE ?'C' :'c' ); + ret =snprintf (str, size,"%s: flags %c" , +cdnsp_trb_type_string (type), + field3 &TRB_CYCLE ?'C' :'c' );break ;case TRB_DISABLE_SLOT : - ret +=snprintf (str, size,"%s: slot %ld flags %c" , -cdnsp_trb_type_string (type), -TRB_TO_SLOT_ID (field3), - field3 &TRB_CYCLE ?'C' :'c' ); + ret =snprintf (str, size,"%s: slot %ld flags %c" , +cdnsp_trb_type_string (type), +TRB_TO_SLOT_ID (field3), + field3 &TRB_CYCLE ?'C' :'c' );break ;case TRB_ADDR_DEV : - ret +=snprintf (str, size, -"%s: ctx %08x%08x slot %ld flags %c:%c" , -cdnsp_trb_type_string (type), field1, field0, -TRB_TO_SLOT_ID (field3), - field3 &TRB_BSR ?'B' :'b' , - field3 &TRB_CYCLE ?'C' :'c' ); + ret =snprintf (str, size, +"%s: ctx %08x%08x slot %ld flags %c:%c" , +cdnsp_trb_type_string (type), field1, field0, +TRB_TO_SLOT_ID (field3), + field3 &TRB_BSR ?'B' :'b' , + field3 &TRB_CYCLE ?'C' :'c' );break ;case TRB_CONFIG_EP : - ret +=snprintf (str, size, -"%s: ctx %08x%08x slot %ld flags %c:%c" , -cdnsp_trb_type_string (type), field1, field0, -TRB_TO_SLOT_ID (field3), - field3 &TRB_DC ?'D' :'d' , - field3 &TRB_CYCLE ?'C' :'c' ); + ret =snprintf (str, size, +"%s: ctx %08x%08x slot %ld flags %c:%c" , +cdnsp_trb_type_string (type), field1, field0, +TRB_TO_SLOT_ID (field3), + field3 &TRB_DC ?'D' :'d' , + field3 &TRB_CYCLE ?'C' :'c' );break ;case TRB_EVAL_CONTEXT : - ret +=snprintf (str, size, -"%s: ctx %08x%08x slot %ld flags %c" , -cdnsp_trb_type_string (type), field1, field0, -TRB_TO_SLOT_ID (field3), - field3 &TRB_CYCLE ?'C' :'c' ); + ret =snprintf (str, size, +"%s: ctx %08x%08x slot %ld flags %c" , +cdnsp_trb_type_string (type), field1, field0, +TRB_TO_SLOT_ID (field3), + field3 &TRB_CYCLE ?'C' :'c' );break ;case TRB_RESET_EP :case TRB_HALT_ENDPOINT :case TRB_FLUSH_ENDPOINT : - ret +=snprintf (str, size, -"%s: ep%d%s(%d) ctx %08x%08x slot %ld flags %c" , -cdnsp_trb_type_string (type), - ep_num, ep_id %2 ?"out" :"in" , -TRB_TO_EP_INDEX (field3), field1, field0, -TRB_TO_SLOT_ID (field3), - field3 &TRB_CYCLE ?'C' :'c' ); + ret =snprintf (str, size, +"%s: ep%d%s(%d) ctx %08x%08x slot %ld flags %c" , +cdnsp_trb_type_string (type), + ep_num, ep_id %2 ?"out" :"in" , +TRB_TO_EP_INDEX (field3), field1, field0, +TRB_TO_SLOT_ID (field3), + field3 &TRB_CYCLE ?'C' :'c' );break ;case TRB_STOP_RING : - ret +=snprintf (str, size, -"%s: ep%d%s(%d) slot %ld sp %d flags %c" , -cdnsp_trb_type_string (type), - ep_num, ep_id %2 ?"out" :"in" , -TRB_TO_EP_INDEX (field3), -TRB_TO_SLOT_ID (field3), -TRB_TO_SUSPEND_PORT (field3), - field3 &TRB_CYCLE ?'C' :'c' ); + ret =snprintf (str, size, +"%s: ep%d%s(%d) slot %ld sp %d flags %c" , +cdnsp_trb_type_string (type), + ep_num, ep_id %2 ?"out" :"in" , +TRB_TO_EP_INDEX (field3), +TRB_TO_SLOT_ID (field3), +TRB_TO_SUSPEND_PORT (field3), + field3 &TRB_CYCLE ?'C' :'c' );break ;case TRB_SET_DEQ : - ret +=snprintf (str, size, -"%s: ep%d%s(%d) deq %08x%08x stream %ld slot %ld flags %c" , -cdnsp_trb_type_string (type), - ep_num, ep_id %2 ?"out" :"in" , -TRB_TO_EP_INDEX (field3), field1, field0, -TRB_TO_STREAM_ID (field2), -TRB_TO_SLOT_ID (field3), - field3 &TRB_CYCLE ?'C' :'c' ); + ret =snprintf (str, size, +"%s: ep%d%s(%d) deq %08x%08x stream %ld slot %ld flags %c" , +cdnsp_trb_type_string (type), + ep_num, ep_id %2 ?"out" :"in" , +TRB_TO_EP_INDEX (field3), field1, field0, +TRB_TO_STREAM_ID (field2), +TRB_TO_SLOT_ID (field3), + field3 &TRB_CYCLE ?'C' :'c' );break ;case TRB_RESET_DEV : - ret +=snprintf (str, size,"%s: slot %ld flags %c" , -cdnsp_trb_type_string (type), -TRB_TO_SLOT_ID (field3), - field3 &TRB_CYCLE ?'C' :'c' ); + ret =snprintf (str, size,"%s: slot %ld flags %c" , +cdnsp_trb_type_string (type), +TRB_TO_SLOT_ID (field3), + field3 &TRB_CYCLE ?'C' :'c' );break ;case TRB_ENDPOINT_NRDY : - temp =TRB_TO_HOST_STREAM (field2); - - ret +=snprintf (str, size, -"%s: ep%d%s(%d) H_SID %x%s%s D_SID %lx flags %c:%c" , -cdnsp_trb_type_string (type), - ep_num, ep_id %2 ?"out" :"in" , -TRB_TO_EP_INDEX (field3), temp, - temp ==STREAM_PRIME_ACK ?"(PRIME)" :"" , - temp ==STREAM_REJECTED ?"(REJECTED)" :"" , -TRB_TO_DEV_STREAM (field0), - field3 &TRB_STAT ?'S' :'s' , - field3 &TRB_CYCLE ?'C' :'c' ); + temp =TRB_TO_HOST_STREAM (field2); + + ret =snprintf (str, size, +"%s: ep%d%s(%d) H_SID %x%s%s D_SID %lx flags %c:%c" , +cdnsp_trb_type_string (type), + ep_num, ep_id %2 ?"out" :"in" , +TRB_TO_EP_INDEX (field3), temp, + temp ==STREAM_PRIME_ACK ?"(PRIME)" :"" , + temp ==STREAM_REJECTED ?"(REJECTED)" :"" , +TRB_TO_DEV_STREAM (field0), + field3 &TRB_STAT ?'S' :'s' , + field3 &TRB_CYCLE ?'C' :'c' );break ;default : - ret +=snprintf (str, size, -"type '%s' -> raw %08x %08x %08x %08x" , -cdnsp_trb_type_string (type), - field0, field1, field2, field3); + ret =snprintf (str, size, +"type '%s' -> raw %08x %08x %08x %08x" , +cdnsp_trb_type_string (type), + field0, field1, field2, field3); } +if (ret >= size) +pr_info ("CDNSP: buffer overflowed.\n" ); +return str; }
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 10/98 ptp: replace snprintf with sysfs_emit
In reply to Sasha LevinFrom: Yang Guang <[email protected]>
[ Upstream commit e2cf07654efb0fd7bbcb475c6f74be7b5755a8fd ]
coccinelle report:
./drivers/ptp/ptp_sysfs.c:17:8-16:
WARNING: use scnprintf or sprintf
./drivers/ptp/ptp_sysfs.c:390:8-16:
WARNING: use scnprintf or sprintf
Use sysfs_emit instead of scnprintf or sprintf makes more sense.
--- drivers/ptp/ptp_sysfs.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/ptp/ptp_sysfs.c +2 -2
@@ -14,7 +14,7 @@ static ssize_t clock_name_show(struct device *dev, struct device_attribute *attr, char *page) { struct ptp_clock *ptp = dev_get_drvdata(dev); -return snprintf (page,PAGE_SIZE -1 ,"%s\n" , ptp->info->name); +return sysfs_emit (page,"%s\n" , ptp->info->name); }static DEVICE_ATTR_RO (clock_name);
@@ -387,7 +387,7 @@ static ssize_t ptp_pin_show(struct device *dev, struct device_attribute *attr,mutex_unlock (&ptp->pincfg_mux); -return snprintf (page,PAGE_SIZE ,"%u %u\n" , func, chan); +return sysfs_emit (page,"%u %u\n" , func, chan); } static ssize_t ptp_pin_store(struct device *dev, struct device_attribute *attr,
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 11/98 drm/amdkfd: Don't take process mutex for svm ioctls
In reply to Sasha LevinFrom: Philip Yang <[email protected]>
[ Upstream commit ac7c48c0cce00d03b3c95fddcccb0a45257e33e3 ]
SVM ioctls take proper svms->lock to handle race conditions, don't need take process mutex to serialize ioctls. This also fixes circular locking warning:
WARNING: possible circular locking dependency detected
Possible unsafe locking scenario:
CPU0 CPU1
---- ----
lock((work_completion)(&svms->deferred_list_work));
lock(&process->mutex);
lock((work_completion)(&svms->deferred_list_work)); lock(&process->mutex);
*** DEADLOCK ***
--- drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +0 -4
@@ -1807,13 +1807,9 @@ static int kfd_ioctl_svm(struct file *filep, struct kfd_process *p, void *data)if (!args->start_addr || !args->size)return -EINVAL ; -mutex_lock (&p->mutex); - r =svm_ioctl (p, args->op, args->start_addr, args->size, args->nattr, args->attrs); -mutex_unlock (&p->mutex); - return r; }#else
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 12/98 powerpc: dts: t104xrdb: fix phy type for FMAN 4/5
In reply to Sasha LevinFrom: Maxim Kiselev <[email protected]>
[ Upstream commit 17846485dff91acce1ad47b508b633dffc32e838 ]
T1040RDB has two RTL8211E-VB phys which requires setting of internal delays for correct work.
Changing the phy-connection-type property to rgmii-id will fix this issue.
--- arch/powerpc/boot/dts/fsl/t104xrdb.dtsi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
arch/powerpc/boot/dts/fsl/t104xrdb.dtsi +2 -2
@@ -139,12 +139,12 @@ pca9546@77 { fman@400000 { ethernet@e6000 { phy-handle = <&phy_rgmii_0>; - phy-connection-type = "rgmii"; + phy-connection-type = "rgmii-id"; }; ethernet@e8000 { phy-handle = <&phy_rgmii_1>; - phy-connection-type = "rgmii"; + phy-connection-type = "rgmii-id"; }; mdio0: mdio@fc000 {
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 13/98 ath11k: fix kernel panic during unload/load ath11k modules
In reply to Sasha LevinFrom: Venkateswara Naralasetty <[email protected]>
[ Upstream commit 22b59cb965f79ee1accf83172441c9ca0ecb632a ]
Call netif_napi_del() from ath11k_ahb_free_ext_irq() to fix the following kernel panic when unload/load ath11k modules for few iterations.
[ 971.201365] Unable to handle kernel paging request at virtual address 6d97a208 [ 971.204227] pgd = 594c2919 [ 971.211478] [6d97a208] *pgd=00000000 [ 971.214120] Internal error: Oops: 5 [#1] PREEMPT SMP ARM [ 971.412024] CPU: 2 PID: 4435 Comm: insmod Not tainted 5.4.89 #0 [ 971.434256] Hardware name: Generic DT based system [ 971.440165] PC is at napi_by_id+0x10/0x40 [ 971.445019] LR is at netif_napi_add+0x160/0x1dc
[ 971.743127] (napi_by_id) from [<807d89a0>] (netif_napi_add+0x160/0x1dc) [ 971.751295] (netif_napi_add) from [<7f1209ac>] (ath11k_ahb_config_irq+0xf8/0x414 [ath11k_ahb]) [ 971.759164] (ath11k_ahb_config_irq [ath11k_ahb]) from [<7f12135c>] (ath11k_ahb_probe+0x40c/0x51c [ath11k_ahb]) [ 971.768567] (ath11k_ahb_probe [ath11k_ahb]) from [<80666864>] (platform_drv_probe+0x48/0x94) [ 971.779670] (platform_drv_probe) from [<80664718>] (really_probe+0x1c8/0x450) [ 971.789389] (really_probe) from [<80664cc4>] (driver_probe_device+0x15c/0x1b8) [ 971.797547] (driver_probe_device) from [<80664f60>] (device_driver_attach+0x44/0x60) [ 971.805795] (device_driver_attach) from [<806650a0>] (__driver_attach+0x124/0x140) [ 971.814822] (__driver_attach) from [<80662adc>] (bus_for_each_dev+0x58/0xa4) [ 971.823328] (bus_for_each_dev) from [<80663a2c>] (bus_add_driver+0xf0/0x1e8) [ 971.831662] (bus_add_driver) from [<806658a4>] (driver_register+0xa8/0xf0) [ 971.839822] (driver_register) from [<8030269c>] (do_one_initcall+0x78/0x1ac) [ 971.847638] (do_one_initcall) from [<80392524>] (do_init_module+0x54/0x200) [ 971.855968] (do_init_module) from [<803945b0>] (load_module+0x1e30/0x1ffc) [ 971.864126] (load_module) from [<803948b0>] (sys_init_module+0x134/0x17c) [ 971.871852] (sys_init_module) from [<80301000>] (ret_fast_syscall+0x0/0x50)
Tested-on: IPQ8074 hw2.0 AHB WLAN.HK.2.6.0.1-00760-QCAHKSWPL_SILICONZ-1
--- drivers/net/wireless/ath/ath11k/ahb.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/net/wireless/ath/ath11k/ahb.c +2 -0
@@ -391,6 +391,8 @@ static void ath11k_ahb_free_ext_irq(struct ath11k_base *ab)for (j =0 ; j < irq_grp->num_irq; j++)free_irq (ab->irq_num[irq_grp->irqs[j]], irq_grp); + +netif_napi_del (&irq_grp->napi); } }
Signature · 7 lines
2.34.1 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Sasha Levin
maintainerPATCH 14/98 ath11k: pci: fix crash on suspend if board file is not found
In reply to Sasha LevinFrom: Kalle Valo <[email protected]>
[ Upstream commit b4f4c56459a5c744f7f066b9fc2b54ea995030c5 ]
Mario reported that the kernel was crashing on suspend if ath11k was not able to find a board file:
[ 473.693286] PM: Suspending system (s2idle) [ 473.693291] printk: Suspending console(s) (use no_console_suspend to debug) [ 474.407787] BUG: unable to handle page fault for address: 0000000000002070 [ 474.407791] #PF: supervisor read access in kernel mode [ 474.407794] #PF: error_code(0x0000) - not-present page [ 474.407798] PGD 0 P4D 0 [ 474.407801] Oops: 0000 [#1] PREEMPT SMP NOPTI [ 474.407805] CPU: 2 PID: 2350 Comm: kworker/u32:14 Tainted: G W 5.16.0 #248 [...] [ 474.407868] Call Trace: [ 474.407870] <TASK> [ 474.407874] ? _raw_spin_lock_irqsave+0x2a/0x60 [ 474.407882] ? lock_timer_base+0x72/0xa0 [ 474.407889] ? _raw_spin_unlock_irqrestore+0x29/0x3d [ 474.407892] ? try_to_del_timer_sync+0x54/0x80 [ 474.407896] ath11k_dp_rx_pktlog_stop+0x49/0xc0 [ath11k] [ 474.407912] ath11k_core_suspend+0x34/0x130 [ath11k] [ 474.407923] ath11k_pci_pm_suspend+0x1b/0x50 [ath11k_pci] [ 474.407928] pci_pm_suspend+0x7e/0x170 [ 474.407935] ? pci_pm_freeze+0xc0/0xc0 [ 474.407939] dpm_run_callback+0x4e/0x150 [ 474.407947] __device_suspend+0x148/0x4c0 [ 474.407951] async_suspend+0x20/0x90 dmesg-efi-164255130401001: Oops#1 Part1 [ 474.407955] async_run_entry_fn+0x33/0x120 [ 474.407959] process_one_work+0x220/0x3f0 [ 474.407966] worker_thread+0x4a/0x3d0 [ 474.407971] kthread+0x17a/0x1a0 [ 474.407975] ? process_one_work+0x3f0/0x3f0 [ 474.407979] ? set_kthread_struct+0x40/0x40 [ 474.407983] ret_from_fork+0x22/0x30 [ 474.407991] </TASK>
The issue here is that board file loading happens after ath11k_pci_probe() succesfully returns (ath11k initialisation happends asynchronously) and the suspend handler is still enabled, of course failing as ath11k is not properly initialised. Fix this by checking ATH11K_FLAG_QMI_FAIL during both suspend and resume.
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03003-QCAHSPSWPL_V1_V2_SILICONZ_LITE-2
--- drivers/net/wireless/ath/ath11k/pci.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/net/wireless/ath/ath11k/pci.c +10 -0
@@ -1382,6 +1382,11 @@ static __maybe_unused int ath11k_pci_pm_suspend(struct device *dev)struct ath11k_base *ab =dev_get_drvdata (dev);int ret; +if (test_bit (ATH11K_FLAG_QMI_FAIL , &ab->dev_flags)) { +ath11k_dbg (ab,ATH11K_DBG_BOOT ,"boot skipping pci suspend as qmi is not initialised\n" ); +return 0 ; + } + ret =ath11k_core_suspend (ab);if (ret)ath11k_warn (ab,"failed to suspend core: %d\n" , ret);
@@ -1394,6 +1399,11 @@ static __maybe_unused int ath11k_pci_pm_resume(struct device *dev)struct ath11k_base *ab =dev_get_drvdata (dev);int ret; +if (test_bit (ATH11K_FLAG_QMI_FAIL , &ab->dev_flags)) { +ath11k_dbg (ab,ATH11K_DBG_BOOT ,"boot skipping pci resume as qmi is not initialised\n" ); +return 0 ; + } + ret =ath11k_core_resume (ab);if (ret)ath11k_warn (ab,"failed to resume core: %d\n" , ret);
Signature · 7 lines
2.34.1 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Sasha Levin
maintainerPATCH 15/98 ath11k: mhi: use mhi_sync_power_up()
In reply to Sasha LevinFrom: Kalle Valo <[email protected]>
[ Upstream commit 3df6d74aedfdca919cca475d15dfdbc8b05c9e5d ]
If amss.bin was missing ath11k would crash during 'rmmod ath11k_pci'. The reason for that was that we were using mhi_async_power_up() which does not check any errors. But mhi_sync_power_up() on the other hand does check for errors so let's use that to fix the crash.
I was not able to find a reason why an async version was used. ath11k_mhi_start() (which enables state ATH11K_MHI_POWER_ON) is called from ath11k_hif_power_up(), which can sleep. So sync version should be safe to use here.
[ 145.569731] general protection fault, probably for non-canonical address 0xdffffc0000000000: 0000 [#1] PREEMPT SMP DEBUG_PAGEALLOC KASAN PTI [ 145.569789] KASAN: null-ptr-deref in range [0x0000000000000000-0x0000000000000007] [ 145.569843] CPU: 2 PID: 1628 Comm: rmmod Kdump: loaded Tainted: G W 5.16.0-wt-ath+ #567 [ 145.569898] Hardware name: Intel(R) Client Systems NUC8i7HVK/NUC8i7HVB, BIOS HNKBLi70.86A.0067.2021.0528.1339 05/28/2021 [ 145.569956] RIP: 0010:ath11k_hal_srng_access_begin+0xb5/0x2b0 [ath11k] [ 145.570028] Code: df 48 89 fa 48 c1 ea 03 80 3c 02 00 0f 85 ec 01 00 00 48 8b ab a8 00 00 00 48 b8 00 00 00 00 00 fc ff df 48 89 ea 48 c1 ea 03 <0f> b6 14 02 48 89 e8 83 e0 07 83 c0 03 45 85 ed 75 48 38 d0 7c 08 [ 145.570089] RSP: 0018:ffffc900025d7ac0 EFLAGS: 00010246 [ 145.570144] RAX: dffffc0000000000 RBX: ffff88814fca2dd8 RCX: 1ffffffff50cb455 [ 145.570196] RDX: 0000000000000000 RSI: ffff88814fca2dd8 RDI: ffff88814fca2e80 [ 145.570252] RBP: 0000000000000000 R08: 0000000000000000 R09: ffffffffa8659497 [ 145.570329] R10: fffffbfff50cb292 R11: 0000000000000001 R12: ffff88814fca0000 [ 145.570410] R13: 0000000000000000 R14: ffff88814fca2798 R15: ffff88814fca2dd8 [ 145.570465] FS: 00007fa399988540(0000) GS:ffff888233e00000(0000) knlGS:0000000000000000 [ 145.570519] CS: 0010 DS: 0000 ES: 0000 CR0: 0000000080050033 [ 145.570571] CR2: 00007fa399b51421 CR3: 0000000137898002 CR4: 00000000003706e0 [ 145.570623] Call Trace: [ 145.570675] <TASK> [ 145.570727] ? ath11k_ce_tx_process_cb+0x34b/0x860 [ath11k] [ 145.570797] ath11k_ce_tx_process_cb+0x356/0x860 [ath11k] [ 145.570864] ? tasklet_init+0x150/0x150 [ 145.570919] ? ath11k_ce_alloc_pipes+0x280/0x280 [ath11k] [ 145.570986] ? tasklet_clear_sched+0x42/0xe0 [ 145.571042] ? tasklet_kill+0xe9/0x1b0 [ 145.571095] ? tasklet_clear_sched+0xe0/0xe0 [ 145.571148] ? irq_has_action+0x120/0x120 [ 145.571202] ath11k_ce_cleanup_pipes+0x45a/0x580 [ath11k] [ 145.571270] ? ath11k_pci_stop+0x10e/0x170 [ath11k_pci] [ 145.571345] ath11k_core_stop+0x8a/0xc0 [ath11k] [ 145.571434] ath11k_core_deinit+0x9e/0x150 [ath11k] [ 145.571499] ath11k_pci_remove+0xd2/0x260 [ath11k_pci] [ 145.571553] pci_device_remove+0x9a/0x1c0 [ 145.571605] __device_release_driver+0x332/0x660 [ 145.571659] driver_detach+0x1e7/0x2c0 [ 145.571712] bus_remove_driver+0xe2/0x2d0 [ 145.571772] pci_unregister_driver+0x21/0x250 [ 145.571826] __do_sys_delete_module+0x30a/0x4b0 [ 145.571879] ? free_module+0xac0/0xac0 [ 145.571933] ? lockdep_hardirqs_on_prepare.part.0+0x18c/0x370 [ 145.571986] ? syscall_enter_from_user_mode+0x1d/0x50 [ 145.572039] ? lockdep_hardirqs_on+0x79/0x100 [ 145.572097] do_syscall_64+0x3b/0x90 [ 145.572153] entry_SYSCALL_64_after_hwframe+0x44/0xae
Tested-on: WCN6855 hw2.0 PCI WLAN.HSP.1.1-03003-QCAHSPSWPL_V1_V2_SILICONZ_LITE-2
--- drivers/net/wireless/ath/ath11k/mhi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/ath/ath11k/mhi.c +1 -1
@@ -519,7 +519,7 @@ static int ath11k_mhi_set_state(struct ath11k_pci *ab_pci, ret =0 ;break ;case ATH11K_MHI_POWER_ON : - ret =mhi_async_power_up (ab_pci->mhi_ctrl); + ret =mhi_sync_power_up (ab_pci->mhi_ctrl);break ;case ATH11K_MHI_POWER_OFF :mhi_power_down (ab_pci->mhi_ctrl, true);
Signature · 7 lines
2.34.1 -- ath11k mailing list [email protected] http://lists.infradead.org/mailman/listinfo/ath11k
Sasha Levin
maintainerPATCH 16/98 net/smc: Send directly when TCP_CORK is cleared
In reply to Sasha LevinFrom: Tony Lu <[email protected]>
[ Upstream commit ea785a1a573b390a150010b3c5b81e1ccd8c98a8 ]
According to the man page of TCP_CORK [1], if set, don't send out partial frames. All queued partial frames are sent when option is cleared again.
When applications call setsockopt to disable TCP_CORK, this call is protected by lock_sock(), and tries to mod_delayed_work() to 0, in order to send pending data right now. However, the delayed work smc_tx_work is also protected by lock_sock(). There introduces lock contention for sending data.
To fix it, send pending data directly which acts like TCP, without lock_sock() protected in the context of setsockopt (already lock_sock()ed), and cancel unnecessary dealyed work, which is protected by lock.
[1] https://linux.die.net/man/7/tcp
--- net/smc/af_smc.c | 4 ++-- net/smc/smc_tx.c | 25 +++++++++++++++---------- net/smc/smc_tx.h | 1 + 3 files changed, 18 insertions(+), 12 deletions(-)
net/smc/af_smc.c +2 -2
@@ -2430,8 +2430,8 @@ static int smc_setsockopt(struct socket *sock, int level, int optname, sk->sk_state != SMC_CLOSED) {if (!val) {SMC_STAT_INC (smc, cork_cnt); -mod_delayed_work (smc->conn.lgr->tx_wq, - &smc->conn.tx_work,0 ); +smc_tx_pending (&smc->conn); +cancel_delayed_work (&smc->conn.tx_work); } }break ;
net/smc/smc_tx.c +15 -10
@@ -594,27 +594,32 @@ int smc_tx_sndbuf_nonempty(struct smc_connection *conn)return rc; } -/* Wakeup sndbuf consumers from process context -* since there is more data to transmit -*/ -void smc_tx_work (struct work_struct *work) +void smc_tx_pending (struct smc_connection *conn) { -struct smc_connection *conn =container_of (to_delayed_work (work), - struct smc_connection, - tx_work); struct smc_sock *smc = container_of(conn, struct smc_sock, conn);int rc; -lock_sock (&smc->sk);if (smc->sk.sk_err) - goto out; +return ; rc =smc_tx_sndbuf_nonempty (conn);if (!rc && conn->local_rx_ctrl.prod_flags.write_blocked && !atomic_read (&conn->bytes_to_rcv)) conn->local_rx_ctrl.prod_flags.write_blocked =0 ; +} + +/* Wakeup sndbuf consumers from process context +* since there is more data to transmit +*/ +void smc_tx_work (struct work_struct *work) +{ +struct smc_connection *conn =container_of (to_delayed_work (work), + struct smc_connection, + tx_work); + struct smc_sock *smc = container_of(conn, struct smc_sock, conn); -out: +lock_sock (&smc->sk); +smc_tx_pending (conn);release_sock (&smc->sk); }
net/smc/smc_tx.h +1 -0
@@ -27,6 +27,7 @@ static inline int smc_tx_prepared_sends(struct smc_connection *conn)return smc_curs_diff (conn->sndbuf_desc->len, &sent, &prep); } +void smc_tx_pending (struct smc_connection *conn);void smc_tx_work (struct work_struct *work);void smc_tx_init (struct smc_sock *smc);int smc_tx_sendmsg (struct smc_sock *smc,struct msghdr *msg,size_t len);
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 17/98 drm/bridge: Add missing pm_runtime_put_sync
In reply to Sasha LevinFrom: Yongzhi Liu <[email protected]>
[ Upstream commit 46f47807738441e354873546dde0b000106c068a ]
pm_runtime_get_sync() will increase the rumtime PM counter even when it returns an error. Thus a pairing decrement is needed to prevent refcount leak. Fix this by replacing this API with pm_runtime_resume_and_get(), which will not change the runtime PM counter on error. Besides, a matching decrement is needed on the error handling path to keep the counter balanced.
--- drivers/gpu/drm/bridge/nwl-dsi.c | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-)
drivers/gpu/drm/bridge/nwl-dsi.c +12 -6
@@ -861,18 +861,19 @@ nwl_dsi_bridge_mode_set(struct drm_bridge *bridge,memcpy (&dsi->mode, adjusted_mode,sizeof (dsi->mode));drm_mode_debug_printmodeline (adjusted_mode); -pm_runtime_get_sync (dev); +if (pm_runtime_resume_and_get (dev) <0 ) +return ;if (clk_prepare_enable (dsi->lcdif_clk) <0 ) -return ; + goto runtime_put;if (clk_prepare_enable (dsi->core_clk) <0 ) -return ; + goto runtime_put;/* Step 1 from DSI reset-out instructions */ ret =reset_control_deassert (dsi->rst_pclk);if (ret <0 ) {DRM_DEV_ERROR (dev,"Failed to deassert PCLK: %d\n" , ret); -return ; + goto runtime_put; }/* Step 2 from DSI reset-out instructions */
@@ -882,13 +883,18 @@ nwl_dsi_bridge_mode_set(struct drm_bridge *bridge, ret =reset_control_deassert (dsi->rst_esc);if (ret <0 ) {DRM_DEV_ERROR (dev,"Failed to deassert ESC: %d\n" , ret); -return ; + goto runtime_put; } ret =reset_control_deassert (dsi->rst_byte);if (ret <0 ) {DRM_DEV_ERROR (dev,"Failed to deassert BYTE: %d\n" , ret); -return ; + goto runtime_put; } + +return ; + +runtime_put: +pm_runtime_put_sync (dev); } static void
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 18/98 bpf: Make dst_port field in struct bpf_sock 16-bit wide
In reply to Sasha LevinFrom: Jakub Sitnicki <[email protected]>
[ Upstream commit 4421a582718ab81608d8486734c18083b822390d ]
Menglong Dong reports that the documentation for the dst_port field in struct bpf_sock is inaccurate and confusing. From the BPF program PoV, the field is a zero-padded 16-bit integer in network byte order. The value appears to the BPF user as if laid out in memory as so:
offsetof(struct bpf_sock, dst_port) + 0 <port MSB>
+ 8 <port LSB>
+16 0x00
+24 0x0032-, 16-, and 8-bit wide loads from the field are all allowed, but only if the offset into the field is 0.
32-bit wide loads from dst_port are especially confusing. The loaded value, after converting to host byte order with bpf_ntohl(dst_port), contains the port number in the upper 16-bits.
Remove the confusion by splitting the field into two 16-bit fields. For backward compatibility, allow 32-bit wide loads from offsetof(struct bpf_sock, dst_port).
While at it, allow loads 8-bit loads at offset [0] and [1] from dst_port.
--- include/uapi/linux/bpf.h | 3 ++- net/core/filter.c | 10 +++++++++- 2 files changed, 11 insertions(+), 2 deletions(-)
include/uapi/linux/bpf.h +2 -1
@@ -5347,7 +5347,8 @@ struct bpf_sock {__u32 src_ip4;__u32 src_ip6[4 ];__u32 src_port;/* host byte order */ -__u32 dst_port;/* network byte order */ +__be16 dst_port;/* network byte order */ + __u16 :16 ;/* zero padding */ __u32 dst_ip4;__u32 dst_ip6[4 ];__u32 state;
net/core/filter.c +9 -1
@@ -7966,6 +7966,7 @@ bool bpf_sock_is_valid_access(int off, int size, enum bpf_access_type type, struct bpf_insn_access_aux *info) {const int size_default =sizeof (__u32); +int field_size;if (off <0 || off >=sizeof (struct bpf_sock ))return false;
@@ -7977,7 +7978,6 @@ bool bpf_sock_is_valid_access(int off, int size, enum bpf_access_type type,case offsetof(struct bpf_sock , family):case offsetof(struct bpf_sock , type):case offsetof(struct bpf_sock , protocol): -case offsetof(struct bpf_sock , dst_port):case offsetof(struct bpf_sock , src_port):case offsetof(struct bpf_sock , rx_queue_mapping): case bpf_ctx_range(struct bpf_sock, src_ip4):
@@ -7986,6 +7986,14 @@ bool bpf_sock_is_valid_access(int off, int size, enum bpf_access_type type, case bpf_ctx_range_till(struct bpf_sock, dst_ip6[0], dst_ip6[3]):bpf_ctx_record_field_size (info, size_default);return bpf_ctx_narrow_access_ok (off, size, size_default); + case bpf_ctx_range(struct bpf_sock, dst_port): + field_size = size == size_default ? + size_default : sizeof_field(struct bpf_sock, dst_port); +bpf_ctx_record_field_size (info, field_size); +return bpf_ctx_narrow_access_ok (off, size, field_size); + case offsetofend(struct bpf_sock, dst_port) ... + offsetof(struct bpf_sock, dst_ip4) - 1: +return false; }return size == size_default;
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 19/98 scsi: mvsas: Replace snprintf() with sysfs_emit()
In reply to Sasha LevinFrom: Yang Guang <[email protected]>
[ Upstream commit 0ad3867b0f13e45cfee5a1298bfd40eef096116c ]
coccinelle report:
./drivers/scsi/mvsas/mv_init.c:699:8-16:
WARNING: use scnprintf or sprintf
./drivers/scsi/mvsas/mv_init.c:747:8-16:
WARNING: use scnprintf or sprintf
Use sysfs_emit() instead of scnprintf() or sprintf().
--- drivers/scsi/mvsas/mv_init.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/scsi/mvsas/mv_init.c +2 -2
@@ -696,7 +696,7 @@ static struct pci_driver mvs_pci_driver = {static ssize_t driver_version_show (struct device *cdev,struct device_attribute *attr,char *buffer) { -return snprintf (buffer,PAGE_SIZE ,"%s\n" ,DRV_VERSION ); +return sysfs_emit (buffer,"%s\n" ,DRV_VERSION ); }static DEVICE_ATTR_RO (driver_version);
@@ -744,7 +744,7 @@ static ssize_t interrupt_coalescing_store(struct device *cdev,static ssize_t interrupt_coalescing_show (struct device *cdev,struct device_attribute *attr,char *buffer) { -return snprintf (buffer,PAGE_SIZE ,"%d\n" , interrupt_coalescing); +return sysfs_emit (buffer,"%d\n" , interrupt_coalescing); }static DEVICE_ATTR_RW (interrupt_coalescing);
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 20/98 scsi: bfa: Replace snprintf() with sysfs_emit()
In reply to Sasha LevinFrom: Yang Guang <[email protected]>
[ Upstream commit 2245ea91fd3a04cafbe2f54911432a8657528c3b ]
coccinelle report:
./drivers/scsi/bfa/bfad_attr.c:908:8-16:
WARNING: use scnprintf or sprintf
./drivers/scsi/bfa/bfad_attr.c:860:8-16:
WARNING: use scnprintf or sprintf
./drivers/scsi/bfa/bfad_attr.c:888:8-16:
WARNING: use scnprintf or sprintf
./drivers/scsi/bfa/bfad_attr.c:853:8-16:
WARNING: use scnprintf or sprintf
./drivers/scsi/bfa/bfad_attr.c:808:8-16:
WARNING: use scnprintf or sprintf
./drivers/scsi/bfa/bfad_attr.c:728:8-16:
WARNING: use scnprintf or sprintf
./drivers/scsi/bfa/bfad_attr.c:822:8-16:
WARNING: use scnprintf or sprintf
./drivers/scsi/bfa/bfad_attr.c:927:9-17:
WARNING: use scnprintf or sprintf
./drivers/scsi/bfa/bfad_attr.c:900:8-16:
WARNING: use scnprintf or sprintf
./drivers/scsi/bfa/bfad_attr.c:874:8-16:
WARNING: use scnprintf or sprintf
./drivers/scsi/bfa/bfad_attr.c:714:8-16:
WARNING: use scnprintf or sprintf
./drivers/scsi/bfa/bfad_attr.c:839:8-16:
WARNING: use scnprintf or sprintf
Use sysfs_emit() instead of scnprintf() or sprintf().
--- drivers/scsi/bfa/bfad_attr.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-)
drivers/scsi/bfa/bfad_attr.c +13 -13
@@ -711,7 +711,7 @@ bfad_im_serial_num_show(struct device *dev, struct device_attribute *attr,char serial_num[BFA_ADAPTER_SERIAL_NUM_LEN ];bfa_get_adapter_serial_num (&bfad->bfa, serial_num); -return snprintf (buf,PAGE_SIZE ,"%s\n" , serial_num); +return sysfs_emit (buf,"%s\n" , serial_num); } static ssize_t
@@ -725,7 +725,7 @@ bfad_im_model_show(struct device *dev, struct device_attribute *attr,char model[BFA_ADAPTER_MODEL_NAME_LEN ];bfa_get_adapter_model (&bfad->bfa, model); -return snprintf (buf,PAGE_SIZE ,"%s\n" , model); +return sysfs_emit (buf,"%s\n" , model); } static ssize_t
@@ -805,7 +805,7 @@ bfad_im_model_desc_show(struct device *dev, struct device_attribute *attr,snprintf (model_descr,BFA_ADAPTER_MODEL_DESCR_LEN ,"Invalid Model" ); -return snprintf (buf,PAGE_SIZE ,"%s\n" , model_descr); +return sysfs_emit (buf,"%s\n" , model_descr); } static ssize_t
@@ -819,7 +819,7 @@ bfad_im_node_name_show(struct device *dev, struct device_attribute *attr,u64 nwwn; nwwn =bfa_fcs_lport_get_nwwn (port->fcs_port); -return snprintf (buf,PAGE_SIZE ,"0x%llx\n" ,cpu_to_be64 (nwwn)); +return sysfs_emit (buf,"0x%llx\n" ,cpu_to_be64 (nwwn)); } static ssize_t
@@ -836,7 +836,7 @@ bfad_im_symbolic_name_show(struct device *dev, struct device_attribute *attr,bfa_fcs_lport_get_attr (&bfad->bfa_fcs.fabric.bport, &port_attr);strlcpy (symname, port_attr.port_cfg.sym_name.symname,BFA_SYMNAME_MAXLEN ); -return snprintf (buf,PAGE_SIZE ,"%s\n" , symname); +return sysfs_emit (buf,"%s\n" , symname); } static ssize_t
@@ -850,14 +850,14 @@ bfad_im_hw_version_show(struct device *dev, struct device_attribute *attr,char hw_ver[BFA_VERSION_LEN ];bfa_get_pci_chip_rev (&bfad->bfa, hw_ver); -return snprintf (buf,PAGE_SIZE ,"%s\n" , hw_ver); +return sysfs_emit (buf,"%s\n" , hw_ver); }static ssize_t bfad_im_drv_version_show (struct device *dev,struct device_attribute *attr,char *buf) { -return snprintf (buf,PAGE_SIZE ,"%s\n" ,BFAD_DRIVER_VERSION ); +return sysfs_emit (buf,"%s\n" ,BFAD_DRIVER_VERSION ); } static ssize_t
@@ -871,7 +871,7 @@ bfad_im_optionrom_version_show(struct device *dev,char optrom_ver[BFA_VERSION_LEN ];bfa_get_adapter_optrom_ver (&bfad->bfa, optrom_ver); -return snprintf (buf,PAGE_SIZE ,"%s\n" , optrom_ver); +return sysfs_emit (buf,"%s\n" , optrom_ver); } static ssize_t
@@ -885,7 +885,7 @@ bfad_im_fw_version_show(struct device *dev, struct device_attribute *attr,char fw_ver[BFA_VERSION_LEN ];bfa_get_adapter_fw_ver (&bfad->bfa, fw_ver); -return snprintf (buf,PAGE_SIZE ,"%s\n" , fw_ver); +return sysfs_emit (buf,"%s\n" , fw_ver); } static ssize_t
@@ -897,7 +897,7 @@ bfad_im_num_of_ports_show(struct device *dev, struct device_attribute *attr, (struct bfad_im_port_s *) shost->hostdata[0 ];struct bfad_s *bfad = im_port->bfad; -return snprintf (buf,PAGE_SIZE ,"%d\n" , +return sysfs_emit (buf,"%d\n" ,bfa_get_nports (&bfad->bfa)); }
@@ -905,7 +905,7 @@ static ssize_t bfad_im_drv_name_show(struct device *dev, struct device_attribute *attr, char *buf) { - return snprintf(buf, PAGE_SIZE, "%s\n", BFAD_DRIVER_NAME); + return sysfs_emit(buf, "%s\n", BFAD_DRIVER_NAME); } static ssize_t
@@ -924,14 +924,14 @@ bfad_im_num_of_discovered_ports_show(struct device *dev, rports =kcalloc (nrports,sizeof (struct bfa_rport_qualifier_s ),GFP_ATOMIC );if (rports ==NULL ) -return snprintf (buf,PAGE_SIZE ,"Failed\n" ); +return sysfs_emit (buf,"Failed\n" );spin_lock_irqsave (&bfad->bfad_lock, flags);bfa_fcs_lport_get_rport_quals (port->fcs_port, rports, &nrports);spin_unlock_irqrestore (&bfad->bfad_lock, flags);kfree (rports); -return snprintf (buf,PAGE_SIZE ,"%d\n" , nrports); +return sysfs_emit (buf,"%d\n" , nrports); } static DEVICE_ATTR(serial_number, S_IRUGO,
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 21/98 drm/v3d: fix missing unlock
In reply to Sasha LevinFrom: Yongzhi Liu <[email protected]>
[ Upstream commit e57c1a3bd5e8e0c7181f65ae55581f0236a8f284 ]
[why]
Unlock is needed on the error handling path to prevent dead lock. v3d_submit_cl_ioctl and v3d_submit_csd_ioctl is missing unlock.
[how]
Fix this by changing goto target on the error handling path. So changing the goto to target an error handling path that includes drm_gem_unlock reservations.
--- drivers/gpu/drm/v3d/v3d_gem.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/gpu/drm/v3d/v3d_gem.c +4 -2
@@ -625,7 +625,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data,if (!render->base.perfmon) { ret = -ENOENT ; - goto fail; + goto fail_perfmon; } }
@@ -678,6 +678,7 @@ v3d_submit_cl_ioctl(struct drm_device *dev, void *data, fail_unreserve:mutex_unlock (&v3d->sched_lock); +fail_perfmon:drm_gem_unlock_reservations (last_job->bo, last_job->bo_count, &acquire_ctx); fail:
@@ -854,7 +855,7 @@ v3d_submit_csd_ioctl(struct drm_device *dev, void *data, args->perfmon_id);if (!job->base.perfmon) { ret = -ENOENT ; - goto fail; + goto fail_perfmon; } }
@@ -886,6 +887,7 @@ v3d_submit_csd_ioctl(struct drm_device *dev, void *data, fail_unreserve:mutex_unlock (&v3d->sched_lock); +fail_perfmon:drm_gem_unlock_reservations (clean_job->bo, clean_job->bo_count, &acquire_ctx); fail:
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 22/98 power: supply: axp20x_battery: properly report current when discharging
In reply to Sasha LevinFrom: Evgeny Boger <[email protected]>
[ Upstream commit d4f408cdcd26921c1268cb8dcbe8ffb6faf837f3 ]
As stated in [1], negative current values are used for discharging batteries.
AXP PMICs internally have two different ADC channels for shunt current
measurement: one used during charging and one during discharging. The values reported by these ADCs are unsigned.
While the driver properly selects ADC channel to get the data from, it doesn't apply negative sign when reporting discharging current.
[1] Documentation/ABI/testing/sysfs-class-power
--- drivers/power/supply/axp20x_battery.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/power/supply/axp20x_battery.c +6 -7
@@ -186,7 +186,6 @@ static int axp20x_battery_get_prop(struct power_supply *psy, union power_supply_propval *val) {struct axp20x_batt_ps *axp20x_batt =power_supply_get_drvdata (psy); -struct iio_channel *chan;int ret =0 , reg, val1;switch (psp) {
@@ -266,12 +265,12 @@ static int axp20x_battery_get_prop(struct power_supply *psy,if (ret)return ret; -if (reg &AXP20X_PWR_STATUS_BAT_CHARGING ) - chan = axp20x_batt->batt_chrg_i; -else - chan = axp20x_batt->batt_dischrg_i; - - ret =iio_read_channel_processed (chan, &val->intval); +if (reg &AXP20X_PWR_STATUS_BAT_CHARGING ) { + ret =iio_read_channel_processed (axp20x_batt->batt_chrg_i, &val->intval); + }else { + ret =iio_read_channel_processed (axp20x_batt->batt_dischrg_i, &val1); + val->intval = -val1; + }if (ret)return ret;
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 23/98 mt76: mt7921: fix crash when startup fails.
In reply to Sasha LevinFrom: Ben Greear <[email protected]>
[ Upstream commit 827e7799c61b978fbc2cc9dac66cb62401b2b3f0 ]
If the nic fails to start, it is possible that the reset_work has already been scheduled. Ensure the work item is canceled so we do not have use-after-free crash in case cleanup is called before the work item is executed.
This fixes crash on my x86_64 apu2 when mt7921k radio fails to work. Radio still fails, but OS does not crash.
--- drivers/net/wireless/mediatek/mt76/mt7921/main.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/mediatek/mt76/mt7921/main.c +1 -0
@@ -224,6 +224,7 @@ static void mt7921_stop(struct ieee80211_hw *hw)cancel_delayed_work_sync (&dev->pm.ps_work);cancel_work_sync (&dev->pm.wake_work); +cancel_work_sync (&dev->reset_work);mt76_connac_free_pending_tx_skbs (&dev->pm,NULL );mt7921_mutex_acquire (dev);
Signature · 7 lines
2.34.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 24/98 mt76: dma: initialize skip_unmap in mt76_dma_rx_fill
In reply to Sasha LevinFrom: Lorenzo Bianconi <[email protected]>
[ Upstream commit 577298ec55dfc8b9aece54520f0258c3f93a6573 ]
Even if it is only a false-positive since skip_buf0/skip_buf1 are only used in mt76_dma_tx_cleanup_idx routine, initialize skip_unmap in mt76_dma_rx_fill in order to fix the following UBSAN report:
[ 13.924906] UBSAN: invalid-load in linux-5.15.0/drivers/net/wireless/mediatek/mt76/dma.c:162:13 [ 13.924909] load of value 225 is not a valid value for type '_Bool' [ 13.924912] CPU: 9 PID: 672 Comm: systemd-udevd Not tainted 5.15.0-18-generic #18-Ubuntu [ 13.924914] Hardware name: LENOVO 21A0000CMX/21A0000CMX, BIOS R1MET43W (1.13 ) 11/05/2021 [ 13.924915] Call Trace: [ 13.924917] <TASK> [ 13.924920] show_stack+0x52/0x58 [ 13.924925] dump_stack_lvl+0x4a/0x5f [ 13.924931] dump_stack+0x10/0x12 [ 13.924932] ubsan_epilogue+0x9/0x45 [ 13.924934] __ubsan_handle_load_invalid_value.cold+0x44/0x49 [ 13.924935] ? __iommu_dma_map+0x84/0xf0 [ 13.924939] mt76_dma_add_buf.constprop.0.cold+0x23/0x85 [mt76] [ 13.924949] mt76_dma_rx_fill.isra.0+0x102/0x1f0 [mt76] [ 13.924954] mt76_dma_init+0xc9/0x150 [mt76] [ 13.924959] ? mt7921_dma_enable+0x110/0x110 [mt7921e] [ 13.924966] mt7921_dma_init+0x1e3/0x260 [mt7921e] [ 13.924970] mt7921_register_device+0x29d/0x510 [mt7921e] [ 13.924975] mt7921_pci_probe.part.0+0x17f/0x1b0 [mt7921e] [ 13.924980] mt7921_pci_probe+0x43/0x60 [mt7921e] [ 13.924984] local_pci_probe+0x4b/0x90 [ 13.924987] pci_device_probe+0x115/0x1f0 [ 13.924989] really_probe+0x21e/0x420 [ 13.924992] __driver_probe_device+0x115/0x190 [ 13.924994] driver_probe_device+0x23/0xc0 [ 13.924996] __driver_attach+0xbd/0x1d0 [ 13.924998] ? __device_attach_driver+0x110/0x110 [ 13.924999] bus_for_each_dev+0x7e/0xc0 [ 13.925001] driver_attach+0x1e/0x20 [ 13.925003] bus_add_driver+0x135/0x200 [ 13.925005] driver_register+0x95/0xf0 [ 13.925008] ? 0xffffffffc0766000 [ 13.925010] __pci_register_driver+0x68/0x70 [ 13.925011] mt7921_pci_driver_init+0x23/0x1000 [mt7921e] [ 13.925015] do_one_initcall+0x48/0x1d0 [ 13.925019] ? kmem_cache_alloc_trace+0x19e/0x2e0 [ 13.925022] do_init_module+0x62/0x280 [ 13.925025] load_module+0xac9/0xbb0 [ 13.925027] __do_sys_finit_module+0xbf/0x120 [ 13.925029] __x64_sys_finit_module+0x18/0x20 [ 13.925030] do_syscall_64+0x5c/0xc0 [ 13.925033] ? do_syscall_64+0x69/0xc0 [ 13.925034] ? sysvec_reschedule_ipi+0x78/0xe0 [ 13.925036] ? asm_sysvec_reschedule_ipi+0xa/0x20 [ 13.925039] entry_SYSCALL_64_after_hwframe+0x44/0xae [ 13.925040] RIP: 0033:0x7fbf2b90f94d [ 13.925045] RSP: 002b:00007ffe2ec7e5d8 EFLAGS: 00000246 ORIG_RAX: 0000000000000139 [ 13.925047] RAX: ffffffffffffffda RBX: 000056106b0634e0 RCX: 00007fbf2b90f94d [ 13.925048] RDX: 0000000000000000 RSI: 00007fbf2baa3441 RDI: 0000000000000013 [ 13.925049] RBP: 0000000000020000 R08: 0000000000000000 R09: 0000000000000002 [ 13.925050] R10: 0000000000000013 R11: 0000000000000246 R12: 00007fbf2baa3441 [ 13.925051] R13: 000056106b062620 R14: 000056106b0610c0 R15: 000056106b0640d0 [ 13.925053] </TASK>
--- drivers/net/wireless/mediatek/mt76/dma.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/mediatek/mt76/dma.c +1 -0
@@ -465,6 +465,7 @@ mt76_dma_rx_fill(struct mt76_dev *dev, struct mt76_queue *q) qbuf.addr = addr + offset; qbuf.len = len - offset; + qbuf.skip_unmap = false;mt76_dma_add_buf (dev, q, &qbuf,1 ,0 , buf,NULL ); frames++; }
Signature · 7 lines
2.34.1 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
Sasha Levin
maintainerPATCH 25/98 cfg80211: don't add non transmitted BSS to 6GHz scanned channels
In reply to Sasha LevinFrom: Avraham Stern <[email protected]>
[ Upstream commit 5666ee154f4696c011dfa8544aaf5591b6b87515 ]
When adding 6GHz channels to scan request based on reported co-located APs, don't add channels that have only APs with "non-transmitted" BSSes if they only match the wildcard SSID since they will be found by probing the "transmitted" BSS.
--- net/wireless/scan.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
net/wireless/scan.c +8 -1
@@ -702,8 +702,12 @@ static bool cfg80211_find_ssid_match(struct cfg80211_colocated_ap *ap,for (i =0 ; i < request->n_ssids; i++) {/* wildcard ssid in the scan request */ -if (!request->ssids[i].ssid_len) +if (!request->ssids[i].ssid_len) { +if (ap->multi_bss && !ap->transmitted_bssid) +continue ; +return true; + }if (ap->ssid_len && ap->ssid_len == request->ssids[i].ssid_len) {
@@ -829,6 +833,9 @@ static int cfg80211_scan_6ghz(struct cfg80211_registered_device *rdev) !cfg80211_find_ssid_match(ap, request))continue ; +if (!request->n_ssids && ap->multi_bss && !ap->transmitted_bssid) +continue ; +cfg80211_scan_req_add_chan (request, chan, true);memcpy (scan_6ghz_params->bssid, ap->bssid,ETH_ALEN ); scan_6ghz_params->short_ssid = ap->short_ssid;
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 26/98 libbpf: Fix build issue with llvm-readelf
In reply to Sasha LevinFrom: Yonghong Song <[email protected]>
[ Upstream commit 0908a66ad1124c1634c33847ac662106f7f2c198 ]
There are cases where clang compiler is packaged in a way readelf is a symbolic link to llvm-readelf. In such cases, llvm-readelf will be used instead of default binutils readelf, and the following error will appear during libbpf build:
Warning: Num of global symbols in
/home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/sharedobjs/libbpf-in.o (367) does NOT match with num of versioned symbols in /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf.so libbpf.map (383). Please make sure all LIBBPF_API symbols are versioned in libbpf.map.
--- /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf_global_syms.tmp ... +++ /home/yhs/work/bpf-next/tools/testing/selftests/bpf/tools/build/libbpf/libbpf_versioned_syms.tmp ... @@ -324,6 +324,22 @@
btf__str_by_offset
btf__type_by_id
btf__type_cnt
+LIBBPF_0.0.1
+LIBBPF_0.0.2
+LIBBPF_0.0.3
+LIBBPF_0.0.4
+LIBBPF_0.0.5
+LIBBPF_0.0.6
+LIBBPF_0.0.7
+LIBBPF_0.0.8
+LIBBPF_0.0.9
+LIBBPF_0.1.0
+LIBBPF_0.2.0
+LIBBPF_0.3.0
+LIBBPF_0.4.0
+LIBBPF_0.5.0
+LIBBPF_0.6.0
+LIBBPF_0.7.0
libbpf_attach_type_by_name
libbpf_find_kernel_btf
libbpf_find_vmlinux_btf_id
make[2]: *** [Makefile:184: check_abi] Error 1
make[1]: *** [Makefile:140: all] Error 2
The above failure is due to different printouts for some ABS versioned symbols. For example, with the same libbpf.so,
$ /bin/readelf --dyn-syms --wide tools/lib/bpf/libbpf.so | grep "LIBBPF" | grep ABS
134: 0000000000000000 0 OBJECT GLOBAL DEFAULT ABS LIBBPF_0.5.0
202: 0000000000000000 0 OBJECT GLOBAL DEFAULT ABS LIBBPF_0.6.0
...
$ /opt/llvm/bin/readelf --dyn-syms --wide tools/lib/bpf/libbpf.so | grep "LIBBPF" | grep ABS
134: 0000000000000000 0 OBJECT GLOBAL DEFAULT ABS LIBBPF_0.5.0@@LIBBPF_0.5.0
202: 0000000000000000 0 OBJECT GLOBAL DEFAULT ABS LIBBPF_0.6.0@@LIBBPF_0.6.0
...
The binutils readelf doesn't print out the symbol LIBBPF_* version and llvm-readelf does.
Such a difference caused libbpf build failure with llvm-readelf.The proposed fix filters out all ABS symbols as they are not part of the comparison. This works for both binutils readelf and llvm-readelf.
--- tools/lib/bpf/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
tools/lib/bpf/Makefile +2 -2
@@ -126,7 +126,7 @@ GLOBAL_SYM_COUNT = $(shell readelf -s --wide $(BPF_IN_SHARED) | \ sort -u | wc -l) VERSIONED_SYM_COUNT = $(shell readelf --dyn-syms --wide $(OUTPUT)libbpf.so | \ sed 's/\[.*\]//' | \ - awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}' | \ + awk '/GLOBAL/ && /DEFAULT/ && !/UND|ABS/ {print $$NF}' | \ grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | sort -u | wc -l) CMD_TARGETS = $(LIB_TARGET) $(PC_FILE)
@@ -195,7 +195,7 @@ check_abi: $(OUTPUT)libbpf.so $(VERSION_SCRIPT) sort -u > $(OUTPUT)libbpf_global_syms.tmp; \ readelf --dyn-syms --wide $(OUTPUT)libbpf.so | \ sed 's/\[.*\]//' | \ - awk '/GLOBAL/ && /DEFAULT/ && !/UND/ {print $$NF}'| \ + awk '/GLOBAL/ && /DEFAULT/ && !/UND|ABS/ {print $$NF}'| \ grep -Eo '[^ ]+@LIBBPF_' | cut -d@ -f1 | \ sort -u > $(OUTPUT)libbpf_versioned_syms.tmp; \ diff -u $(OUTPUT)libbpf_global_syms.tmp \
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 27/98 ipv6: make mc_forwarding atomic
In reply to Sasha LevinFrom: Eric Dumazet <[email protected]>
[ Upstream commit 145c7a793838add5e004e7d49a67654dc7eba147 ]
This fixes minor data-races in ip6_mc_input() andbatadv_mcast_mla_rtr_flags_softif_get_ipv6()
--- include/linux/ipv6.h | 2 +- net/batman-adv/multicast.c | 2 +- net/ipv6/addrconf.c | 4 ++-- net/ipv6/ip6_input.c | 2 +- net/ipv6/ip6mr.c | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-)
include/linux/ipv6.h +1 -1
@@ -51,7 +51,7 @@ struct ipv6_devconf {__s32 use_optimistic;#endif #ifdef CONFIG_IPV6_MROUTE -__s32 mc_forwarding; +atomic_t mc_forwarding;#endif __s32 disable_ipv6;__s32 drop_unicast_in_l2_multicast;
net/batman-adv/multicast.c +1 -1
@@ -134,7 +134,7 @@ static u8 batadv_mcast_mla_rtr_flags_softif_get_ipv6(struct net_device *dev) {struct inet6_dev *in6_dev =__in6_dev_get (dev); -if (in6_dev && in6_dev->cnf.mc_forwarding) +if (in6_dev &&atomic_read (&in6_dev->cnf.mc_forwarding))return BATADV_NO_FLAGS ;else return BATADV_MCAST_WANT_NO_RTR6 ;
net/ipv6/addrconf.c +2 -2
@@ -552,7 +552,7 @@ static int inet6_netconf_fill_devconf(struct sk_buff *skb, int ifindex,#ifdef CONFIG_IPV6_MROUTE if ((all || type ==NETCONFA_MC_FORWARDING ) &&nla_put_s32 (skb,NETCONFA_MC_FORWARDING , - devconf->mc_forwarding) <0 ) +atomic_read (&devconf->mc_forwarding)) <0 ) goto nla_put_failure;#endif if ((all || type == NETCONFA_PROXY_NEIGH) &&
@@ -5537,7 +5537,7 @@ static inline void ipv6_store_devconf(struct ipv6_devconf *cnf, array[DEVCONF_USE_OPTIMISTIC ] = cnf->use_optimistic;#endif #ifdef CONFIG_IPV6_MROUTE - array[DEVCONF_MC_FORWARDING ] = cnf->mc_forwarding; + array[DEVCONF_MC_FORWARDING ] =atomic_read (&cnf->mc_forwarding);#endif array[DEVCONF_DISABLE_IPV6 ] = cnf->disable_ipv6; array[DEVCONF_ACCEPT_DAD ] = cnf->accept_dad;
net/ipv6/ip6_input.c +1 -1
@@ -508,7 +508,7 @@ int ip6_mc_input(struct sk_buff *skb)/* * IPv6 multicast router mode is now supported ;) */ -if (dev_net (skb->dev)->ipv6.devconf_all->mc_forwarding && +if (atomic_read (&dev_net (skb->dev)->ipv6.devconf_all->mc_forwarding) && !(ipv6_addr_type (&hdr->daddr) & (IPV6_ADDR_LOOPBACK |IPV6_ADDR_LINKLOCAL )) &&likely (!(IP6CB (skb)->flags &IP6SKB_FORWARDED ))) {
net/ipv6/ip6mr.c +4 -4
@@ -739,7 +739,7 @@ static int mif6_delete(struct mr_table *mrt, int vifi, int notify, in6_dev =__in6_dev_get (dev);if (in6_dev) { - in6_dev->cnf.mc_forwarding--; +atomic_dec (&in6_dev->cnf.mc_forwarding);inet6_netconf_notify_devconf (dev_net (dev),RTM_NEWNETCONF ,NETCONFA_MC_FORWARDING , dev->ifindex, &in6_dev->cnf);
@@ -907,7 +907,7 @@ static int mif6_add(struct net *net, struct mr_table *mrt, in6_dev =__in6_dev_get (dev);if (in6_dev) { - in6_dev->cnf.mc_forwarding++; +atomic_inc (&in6_dev->cnf.mc_forwarding);inet6_netconf_notify_devconf (dev_net (dev),RTM_NEWNETCONF ,NETCONFA_MC_FORWARDING , dev->ifindex, &in6_dev->cnf);
@@ -1557,7 +1557,7 @@ static int ip6mr_sk_init(struct mr_table *mrt, struct sock *sk) }else {rcu_assign_pointer (mrt->mroute_sk, sk);sock_set_flag (sk,SOCK_RCU_FREE ); - net->ipv6.devconf_all->mc_forwarding++; +atomic_inc (&net->ipv6.devconf_all->mc_forwarding); }write_unlock_bh (&mrt_lock);
@@ -1590,7 +1590,7 @@ int ip6mr_sk_done(struct sock *sk)* so the RCU grace period before sk freeing * is guaranteed by sk_destruct() */ - net->ipv6.devconf_all->mc_forwarding--; +atomic_dec (&net->ipv6.devconf_all->mc_forwarding);write_unlock_bh (&mrt_lock); inet6_netconf_notify_devconf(net, RTM_NEWNETCONF, NETCONFA_MC_FORWARDING,
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 28/98 net: initialize init_net earlier
In reply to Sasha LevinFrom: Eric Dumazet <[email protected]>
[ Upstream commit 9c1be1935fb68b2413796cdc03d019b8cf35ab51 ]
While testing a patch that will follow later ("net: add netns refcount tracker to struct nsproxy") I found that devtmpfs_init() was called before init_net was initialized.
This is a bug, because devtmpfs_setup() callsksys_unshare(CLONE_NEWNS);
This has the effect of increasing init_net refcount,
which will be later overwritten to 1, as part of setup_net(&init_net)
We had too many prior patches [1] trying to work around the root cause.
Really, make sure init_net is in BSS section, and that net_ns_init() is called earlier at boot time.
Note that another patch ("vfs: add netns refcount tracker to struct fs_context") also will need net_ns_init() being called before vfs_caches_init()
As a bonus, this patch saves around 4KB in .data section.
[1]
f8c46cb39079 ("netns: do not call pernet ops for not yet set up init_net namespace") b5082df8019a ("net: Initialise init_net.count to 1")734b65417b24 ("net: Statically initialize init_net.dev_base_head")
v2: fixed a build error reported by kernel build bots (CONFIG_NET=n)
--- include/net/net_namespace.h | 6 ++++++ init/main.c | 2 ++ net/core/dev.c | 3 +-- net/core/net_namespace.c | 17 +++++------------ 4 files changed, 14 insertions(+), 14 deletions(-)
include/net/net_namespace.h +6 -0
@@ -479,4 +479,10 @@ static inline void fnhe_genid_bump(struct net *net) atomic_inc(&net->fnhe_genid); } +#ifdef CONFIG_NET +void net_ns_init (void ); +#else +static inline void net_ns_init (void ) {} +#endif +#endif /* __NET_NET_NAMESPACE_H */
init/main.c +2 -0
@@ -100,6 +100,7 @@#include <linux/kcsan.h> #include <linux/init_syscalls.h> #include <linux/stackdepot.h> +#include <net/net_namespace.h> #include <asm/io.h> #include <asm/bugs.h>
@@ -1122,6 +1123,7 @@ asmlinkage __visible void __init __no_sanitize_address start_kernel(void)key_init ();security_init ();dbg_late_init (); +net_ns_init ();vfs_caches_init ();pagecache_init ();signals_init ();
net/core/dev.c +1 -2
@@ -11378,8 +11378,7 @@ static int __net_init netdev_init(struct net *net)BUILD_BUG_ON (GRO_HASH_BUCKETS > 8 * sizeof_field(struct napi_struct, gro_bitmask)); -if (net != &init_net) -INIT_LIST_HEAD (&net->dev_base_head); +INIT_LIST_HEAD (&net->dev_base_head); net->dev_name_head =netdev_create_hash ();if (net->dev_name_head ==NULL )
net/core/net_namespace.c +5 -12
@@ -44,13 +44,7 @@ EXPORT_SYMBOL_GPL(net_rwsem);static struct key_tag init_net_key_domain = { .usage =REFCOUNT_INIT (1 ) };#endif -struct net init_net = { - .ns.count =REFCOUNT_INIT (1 ), - .dev_base_head =LIST_HEAD_INIT (init_net.dev_base_head), -#ifdef CONFIG_KEYS - .key_domain = &init_net_key_domain, -#endif -}; +struct net init_net;EXPORT_SYMBOL (init_net);static bool init_net_initialized;
@@ -1081,7 +1075,7 @@ static void rtnl_net_notifyid(struct net *net, int cmd, int id, u32 portid,rtnl_set_sk_err (net,RTNLGRP_NSID , err); } -static int __init net_ns_init (void ) +void __init net_ns_init (void ) {struct net_generic *ng;
@@ -1102,6 +1096,9 @@ static int __init net_ns_init(void)rcu_assign_pointer (init_net.gen, ng); +#ifdef CONFIG_KEYS + init_net.key_domain = &init_net_key_domain; +#endif down_write (&pernet_ops_rwsem);if (setup_net (&init_net, &init_user_ns))panic ("Could not setup the initial network namespace" );
@@ -1116,12 +1113,8 @@ static int __init net_ns_init(void) RTNL_FLAG_DOIT_UNLOCKED);rtnl_register (PF_UNSPEC ,RTM_GETNSID , rtnl_net_getid, rtnl_net_dumpid,RTNL_FLAG_DOIT_UNLOCKED ); - -return 0 ; } -pure_initcall (net_ns_init); -static void free_exit_list (struct pernet_operations *ops,struct list_head *net_exit_list) {ops_pre_exit_list (ops, net_exit_list);
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 29/98 powerpc: Set crashkernel offset to mid of RMA region
In reply to Sasha LevinFrom: Sourabh Jain <[email protected]>
[ Upstream commit 7c5ed82b800d8615cdda00729e7b62e5899f0b13 ]
On large config LPARs (having 192 and more cores), Linux fails to boot due to insufficient memory in the first memblock. It is due to the memory reservation for the crash kernel which starts at 128MB offset of the first memblock. This memory reservation for the crash kernel doesn't leave enough space in the first memblock to accommodate other essential system resources.
The crash kernel start address was set to 128MB offset by default to ensure that the crash kernel get some memory below the RMA region which is used to be of size 256MB. But given that the RMA region size can be 512MB or more, setting the crash kernel offset to mid of RMA size will leave enough space for the kernel to allocate memory for other system resources.
Since the above crash kernel offset change is only applicable to the LPAR platform, the LPAR feature detection is pushed before the crash kernel reservation. The rest of LPAR specific initialization will still be done during pseries_probe_fw_features as usual.
This patch is dependent on changes to paca allocation for boot CPU. It expect boot CPU to discover 1T segment support which is introduced by the patch posted here:
https://lists.ozlabs.org/pipermail/linuxppc-dev/2022-January/239175.html
--- arch/powerpc/kernel/rtas.c | 6 ++++++ arch/powerpc/kexec/core.c | 15 +++++++++++---- 2 files changed, 17 insertions(+), 4 deletions(-)
arch/powerpc/kernel/rtas.c +6 -0
@@ -1235,6 +1235,12 @@ int __init early_init_dt_scan_rtas(unsigned long node, entryp =of_get_flat_dt_prop (node,"linux,rtas-entry" ,NULL ); sizep =of_get_flat_dt_prop (node,"rtas-size" ,NULL ); +#ifdef CONFIG_PPC64 +/* need this feature to decide the crashkernel offset */ +if (of_get_flat_dt_prop (node,"ibm,hypertas-functions" ,NULL )) + powerpc_firmware_features |=FW_FEATURE_LPAR ; +#endif +if (basep && entryp && sizep) { rtas.base = *basep; rtas.entry = *entryp;
arch/powerpc/kexec/core.c +11 -4
@@ -147,11 +147,18 @@ void __init reserve_crashkernel(void)if (!crashk_res.start) {#ifdef CONFIG_PPC64 /* -* On 64bit we split the RMO in half but cap it at half of -* a small SLB (128MB) since the crash kernel needs to place -* itself and some stacks to be in the first segment. +* On the LPAR platform place the crash kernel to mid of +* RMA size (512MB or more) to ensure the crash kernel +* gets enough space to place itself and some stack to be +* in the first segment. At the same time normal kernel +* also get enough space to allocate memory for essential +* system resource in the first segment. Keep the crash +* kernel starts at 128MB offset on other platforms. */ - crashk_res.start =min (0x8000000ULL , (ppc64_rma_size /2 )); +if (firmware_has_feature (FW_FEATURE_LPAR )) + crashk_res.start = ppc64_rma_size /2 ; +else + crashk_res.start =min (0x8000000ULL , (ppc64_rma_size /2 ));#else crashk_res.start =KDUMP_KERNELBASE ;#endif
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 30/98 drm/amdgpu: Fix recursive locking warning
In reply to Sasha LevinFrom: Rajneesh Bhardwaj <[email protected]>
[ Upstream commit 447c7997b62a5115ba4da846dcdee4fc12298a6a ]
Noticed the below warning while running a pytorch workload on vega10 GPUs. Change to trylock to avoid conflicts with already held reservation locks.
[ +0.000003] WARNING: possible recursive locking detected
[ +0.000003] 5.13.0-kfd-rajneesh #1030 Not tainted
[ +0.000004] --------------------------------------------
[ +0.000002] python/4822 is trying to acquire lock:
[ +0.000004] ffff932cd9a259f8 (reservation_ww_class_mutex){+.+.}-{3:3},at: amdgpu_bo_release_notify+0xc4/0x160 [amdgpu]
[ +0.000203]
but task is already holding lock:
[ +0.000003] ffff932cbb7181f8 (reservation_ww_class_mutex){+.+.}-{3:3},
at: ttm_eu_reserve_buffers+0x270/0x470 [ttm]
[ +0.000017]
other info that might help us debug this:
[ +0.000002] Possible unsafe locking scenario:
[ +0.000003] CPU0
[ +0.000002] ----
[ +0.000002] lock(reservation_ww_class_mutex);
[ +0.000004] lock(reservation_ww_class_mutex);
[ +0.000003]
*** DEADLOCK ***[ +0.000002] May be due to missing lock nesting notation
[ +0.000003] 7 locks held by python/4822:
[ +0.000003] #0: ffff932c4ac028d0 (&process->mutex){+.+.}-{3:3}, at:kfd_ioctl_map_memory_to_gpu+0x10b/0x320 [amdgpu]
[ +0.000232] #1: ffff932c55e830a8 (&info->lock#2){+.+.}-{3:3}, at:amdgpu_amdkfd_gpuvm_map_memory_to_gpu+0x64/0xf60 [amdgpu]
[ +0.000241] #2: ffff932cc45b5e68 (&(*mem)->lock){+.+.}-{3:3}, at:amdgpu_amdkfd_gpuvm_map_memory_to_gpu+0xdf/0xf60 [amdgpu]
[ +0.000236] #3: ffffb2b35606fd28 (reservation_ww_class_acquire){+.+.}-{0:0}, at:amdgpu_amdkfd_gpuvm_map_memory_to_gpu+0x232/0xf60 [amdgpu] [ +0.000235] #4: ffff932cbb7181f8 (reservation_ww_class_mutex){+.+.}-{3:3}, at:ttm_eu_reserve_buffers+0x270/0x470 [ttm]
[ +0.000015] #5: ffffffffc045f700 (*(sspp++)){....}-{0:0}, at:drm_dev_enter+0x5/0xa0 [drm]
[ +0.000038] #6: ffff932c52da7078 (&vm->eviction_lock){+.+.}-{3:3},
at: amdgpu_vm_bo_update_mapping+0xd5/0x4f0 [amdgpu]
[ +0.000195]
stack backtrace:
[ +0.000003] CPU: 11 PID: 4822 Comm: python Not tainted 5.13.0-kfd-rajneesh #1030
[ +0.000005] Hardware name: GIGABYTE MZ01-CE0-00/MZ01-CE0-00, BIOS F02 08/29/2018
[ +0.000003] Call Trace: [ +0.000003] dump_stack+0x6d/0x89 [ +0.000010] __lock_acquire+0xb93/0x1a90 [ +0.000009] lock_acquire+0x25d/0x2d0 [ +0.000005] ? amdgpu_bo_release_notify+0xc4/0x160 [amdgpu] [ +0.000184] ? lock_is_held_type+0xa2/0x110 [ +0.000006] ? amdgpu_bo_release_notify+0xc4/0x160 [amdgpu] [ +0.000184] __ww_mutex_lock.constprop.17+0xca/0x1060 [ +0.000007] ? amdgpu_bo_release_notify+0xc4/0x160 [amdgpu] [ +0.000183] ? lock_release+0x13f/0x270 [ +0.000005] ? lock_is_held_type+0xa2/0x110 [ +0.000006] ? amdgpu_bo_release_notify+0xc4/0x160 [amdgpu] [ +0.000183] amdgpu_bo_release_notify+0xc4/0x160 [amdgpu] [ +0.000185] ttm_bo_release+0x4c6/0x580 [ttm] [ +0.000010] amdgpu_bo_unref+0x1a/0x30 [amdgpu] [ +0.000183] amdgpu_vm_free_table+0x76/0xa0 [amdgpu] [ +0.000189] amdgpu_vm_free_pts+0xb8/0xf0 [amdgpu] [ +0.000189] amdgpu_vm_update_ptes+0x411/0x770 [amdgpu] [ +0.000191] amdgpu_vm_bo_update_mapping+0x324/0x4f0 [amdgpu] [ +0.000191] amdgpu_vm_bo_update+0x251/0x610 [amdgpu] [ +0.000191] update_gpuvm_pte+0xcc/0x290 [amdgpu] [ +0.000229] ? amdgpu_vm_bo_map+0xd7/0x130 [amdgpu] [ +0.000190] amdgpu_amdkfd_gpuvm_map_memory_to_gpu+0x912/0xf60 [amdgpu] [ +0.000234] kfd_ioctl_map_memory_to_gpu+0x182/0x320 [amdgpu] [ +0.000218] kfd_ioctl+0x2b9/0x600 [amdgpu] [ +0.000216] ? kfd_ioctl_unmap_memory_from_gpu+0x270/0x270 [amdgpu] [ +0.000216] ? lock_release+0x13f/0x270 [ +0.000006] ? __fget_files+0x107/0x1e0 [ +0.000007] __x64_sys_ioctl+0x8b/0xd0 [ +0.000007] do_syscall_64+0x36/0x70 [ +0.000004] entry_SYSCALL_64_after_hwframe+0x44/0xae [ +0.000007] RIP: 0033:0x7fbff90a7317 [ +0.000004] Code: b3 66 90 48 8b 05 71 4b 2d 00 64 c7 00 26 00 00 00
48 c7 c0 ff ff ff ff c3 66 2e 0f 1f 84 00 00 00 00 00 b8 10 00 00 00 0f 05 <48> 3d 01 f0 ff ff 73 01 c3 48 8b 0d 41 4b 2d 00 f7 d8 64 89 01 48 [ +0.000005] RSP: 002b:00007fbe301fe648 EFLAGS: 00000246 ORIG_RAX:
0000000000000010
[ +0.000006] RAX: ffffffffffffffda RBX: 00007fbcc402d820 RCX:00007fbff90a7317
[ +0.000003] RDX: 00007fbe301fe690 RSI: 00000000c0184b18 RDI:
0000000000000004
[ +0.000003] RBP: 00007fbe301fe690 R08: 0000000000000000 R09:00007fbcc402d880
[ +0.000003] R10: 0000000002001000 R11: 0000000000000246 R12:00000000c0184b18
[ +0.000003] R13: 0000000000000004 R14: 00007fbf689593a0 R15:00007fbcc402d820
--- drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +2 -1
@@ -1343,7 +1343,8 @@ void amdgpu_bo_release_notify(struct ttm_buffer_object *bo) !(abo->flags & AMDGPU_GEM_CREATE_VRAM_WIPE_ON_RELEASE)) return; -dma_resv_lock (bo->base.resv,NULL ); +if (WARN_ON_ONCE (!dma_resv_trylock (bo->base.resv))) +return ; r =amdgpu_fill_buffer (abo,AMDGPU_POISON , bo->base.resv, &fence);if (!WARN_ON (r)) {
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 31/98 scsi: smartpqi: Fix kdump issue when controller is locked up
In reply to Sasha LevinFrom: Mahesh Rajashekhara <[email protected]>
[ Upstream commit 3ada501d602abf02353445c03bb3258146445d90 ]
Avoid dropping into shell if the controller is in locked up state.
Driver issues SIS soft reset to bring back the controller to SIS mode while OS boots into kdump mode.
If the controller is in lockup state, SIS soft reset does not work.
Since the controller lockup code has not been cleared, driver considers the firmware is no longer up and running. Driver returns back an error code to OS and the kdump fails.
--- drivers/scsi/smartpqi/smartpqi_init.c | 39 ++++++++++++++++----------- 1 file changed, 23 insertions(+), 16 deletions(-)
drivers/scsi/smartpqi/smartpqi_init.c +23 -16
@@ -7653,6 +7653,21 @@ static int pqi_force_sis_mode(struct pqi_ctrl_info *ctrl_info)return pqi_revert_to_sis_mode (ctrl_info); } +static void pqi_perform_lockup_action (void ) +{ +switch (pqi_lockup_action) { +case PANIC : +panic ("FATAL: Smart Family Controller lockup detected" ); +break ; +case REBOOT : +emergency_restart (); +break ; +case NONE : +default : +break ; + } +} +static int pqi_ctrl_init (struct pqi_ctrl_info *ctrl_info) {int rc;
@@ -7677,8 +7692,15 @@ static int pqi_ctrl_init(struct pqi_ctrl_info *ctrl_info)* commands. */ rc =sis_wait_for_ctrl_ready (ctrl_info); -if (rc) +if (rc) { +if (reset_devices) { +dev_err (&ctrl_info->pci_dev->dev, +"kdump init failed with error %d\n" , rc); + pqi_lockup_action =REBOOT ; +pqi_perform_lockup_action (); + }return rc; + }/* * Get the controller properties. This allows us to determine
@@ -8402,21 +8424,6 @@ static int pqi_ofa_ctrl_restart(struct pqi_ctrl_info *ctrl_info, unsigned int dereturn pqi_ctrl_init_resume (ctrl_info); } -static void pqi_perform_lockup_action (void ) -{ -switch (pqi_lockup_action) { -case PANIC : -panic ("FATAL: Smart Family Controller lockup detected" ); -break ; -case REBOOT : -emergency_restart (); -break ; -case NONE : -default : -break ; - } -} -static struct pqi_raid_error_info pqi_ctrl_offline_raid_error_info = { .data_out_result =PQI_DATA_IN_OUT_HARDWARE_ERROR , .status =SAM_STAT_CHECK_CONDITION ,
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 32/98 PCI: aardvark: Fix support for MSI interrupts
In reply to Sasha LevinFrom: Pali Rohár <[email protected]>
[ Upstream commit b0b0b8b897f8e12b2368e868bd7cdc5742d5c5a9 ]
Aardvark hardware supports Multi-MSI and MSI_FLAG_MULTI_PCI_MSI is already set for the MSI chip. But when allocating MSI interrupt numbers for Multi-MSI, the numbers need to be properly aligned, otherwise endpoint devices send MSI interrupt with incorrect numbers.
Fix this issue by using function bitmap_find_free_region() instead of bitmap_find_next_zero_area().
To ensure that aligned MSI interrupt numbers are used by endpoint devices, we cannot use Linux virtual irq numbers (as they are random and not properly aligned). Instead we need to use the aligned hwirq numbers.
This change fixes receiving MSI interrupts on Armada 3720 boards and allows using NVMe disks which use Multi-MSI feature with 3 interrupts.
Without this NVMe disks freeze booting as linux nvme-core.c is waiting 60s for an interrupt.
--- drivers/pci/controller/pci-aardvark.c | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-)
drivers/pci/controller/pci-aardvark.c +6 -10
@@ -1177,7 +1177,7 @@ static void advk_msi_irq_compose_msi_msg(struct irq_data *data, msg->address_lo =lower_32_bits (msi_msg); msg->address_hi =upper_32_bits (msi_msg); - msg->data = data->irq; + msg->data = data->hwirq; } static int advk_msi_set_affinity(struct irq_data *irq_data,
@@ -1194,15 +1194,11 @@ static int advk_msi_irq_domain_alloc(struct irq_domain *domain,int hwirq, i;mutex_lock (&pcie->msi_used_lock); - hwirq =bitmap_find_next_zero_area (pcie->msi_used,MSI_IRQ_NUM , -0 , nr_irqs,0 ); -if (hwirq >=MSI_IRQ_NUM ) { -mutex_unlock (&pcie->msi_used_lock); -return -ENOSPC ; - } - -bitmap_set (pcie->msi_used, hwirq, nr_irqs); + hwirq =bitmap_find_free_region (pcie->msi_used,MSI_IRQ_NUM , +order_base_2 (nr_irqs));mutex_unlock (&pcie->msi_used_lock); +if (hwirq <0 ) +return -ENOSPC ;for (i =0 ; i < nr_irqs; i++) irq_domain_set_info(domain, virq + i, hwirq + i,
@@ -1220,7 +1216,7 @@ static void advk_msi_irq_domain_free(struct irq_domain *domain,struct advk_pcie *pcie = domain->host_data;mutex_lock (&pcie->msi_used_lock); -bitmap_clear (pcie->msi_used, d->hwirq, nr_irqs); +bitmap_release_region (pcie->msi_used, d->hwirq,order_base_2 (nr_irqs));mutex_unlock (&pcie->msi_used_lock); }
Signature · 7 lines
2.34.1 _______________________________________________ linux-arm-kernel mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
Sasha Levin
maintainerPATCH 33/98 iommu/arm-smmu-v3: fix event handling soft lockup
In reply to Sasha LevinFrom: Zhou Guanghui <[email protected]>
[ Upstream commit 30de2b541af98179780054836b48825fcfba4408 ]
During event processing, events are read from the event queue one by one until the queue is empty.If the master device continuously requests address access at the same time and the SMMU generates events, the cyclic processing of the event takes a long time and softlockup warnings may be reported.
arm-smmu-v3 arm-smmu-v3.34.auto: event 0x0a received:
arm-smmu-v3 arm-smmu-v3.34.auto: 0x00007f220000280a
arm-smmu-v3 arm-smmu-v3.34.auto: 0x000010000000007e
arm-smmu-v3 arm-smmu-v3.34.auto: 0x00000000034e8670
watchdog: BUG: soft lockup - CPU#0 stuck for 22s! [irq/268-arm-smm:247] Call trace: _dev_info+0x7c/0xa0 arm_smmu_evtq_thread+0x1c0/0x230 irq_thread_fn+0x30/0x80 irq_thread+0x128/0x210 kthread+0x134/0x138 ret_from_fork+0x10/0x1c Kernel panic - not syncing: softlockup: hung tasks
Fix this by calling cond_resched() after the event information is printed.
--- drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 1 + 1 file changed, 1 insertion(+)
drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +1 -0
@@ -1552,6 +1552,7 @@ static irqreturn_t arm_smmu_evtq_thread(int irq, void *dev)dev_info (smmu->dev,"\t0x%016llx\n" , (unsigned long long )evt[i]); +cond_resched (); }/*
Signature · 6 lines
2.34.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Sasha Levin
maintainerPATCH 34/98 usb: ehci: add pci device support for Aspeed platforms
In reply to Sasha LevinFrom: Neal Liu <[email protected]>
[ Upstream commit c3c9cee592828528fd228b01d312c7526c584a42 ]
Enable Aspeed quirks in commit 7f2d73788d90 ("usb: ehci:
handshake CMD_RUN instead of STS_HALT") to support Aspeed ehci-pci device.
--- drivers/usb/host/ehci-pci.c | 9 +++++++++ 1 file changed, 9 insertions(+)
drivers/usb/host/ehci-pci.c +9 -0
@@ -21,6 +21,9 @@ static const char hcd_name[] = "ehci-pci";/* defined here to avoid adding to pci_ids.h for single instance use */ #define PCI_DEVICE_ID_INTEL_CE4100_USB 0x2e70 +#define PCI_VENDOR_ID_ASPEED 0x1a03 +#define PCI_DEVICE_ID_ASPEED_EHCI 0x2603 +/*-------------------------------------------------------------------------*/ #define PCI_DEVICE_ID_INTEL_QUARK_X1000_SOC 0x0939static inline bool is_intel_quark_x1000 (struct pci_dev *pdev)
@@ -222,6 +225,12 @@ static int ehci_pci_setup(struct usb_hcd *hcd) ehci->has_synopsys_hc_bug =1 ; }break ; +case PCI_VENDOR_ID_ASPEED : +if (pdev->device ==PCI_DEVICE_ID_ASPEED_EHCI ) { +ehci_info (ehci,"applying Aspeed HC workaround\n" ); + ehci->is_aspeed =1 ; + } +break ; }/* optional debug port, normally in the first BAR */
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 35/98 PCI: endpoint: Fix alignment fault error in copy tests
In reply to Sasha LevinFrom: Hou Zhiqiang <[email protected]>
[ Upstream commit 829cc0e2ea2d61fb6c54bc3f8a17f86c56e11864 ]
The copy test uses the memcpy() to copy data between IO memory spaces. This can trigger an alignment fault error (pasted the error logs below) because memcpy() may use unaligned accesses on a mapped memory that is just IO, which does not support unaligned memory accesses.
Fix it by using the correct memcpy API to copy from/to IO memory.
Alignment fault error logs:
Unable to handle kernel paging request at virtual address ffff8000101cd3c1
Mem abort info:
ESR = 0x96000021
EC = 0x25: DABT (current EL), IL = 32 bits
SET = 0, FnV = 0
EA = 0, S1PTW = 0
FSC = 0x21: alignment fault
Data abort info:
ISV = 0, ISS = 0x00000021
CM = 0, WnR = 0
swapper pgtable: 4k pages, 48-bit VAs, pgdp=0000000081773000
[ffff8000101cd3c1] pgd=1000000082410003, p4d=1000000082410003, pud=1000000082411003, pmd=1000000082412003, pte=0068004000001f13
Internal error: Oops: 96000021 [#1] PREEMPT SMP
Modules linked in:
CPU: 0 PID: 6 Comm: kworker/0:0H Not tainted 5.15.0-rc1-next-20210914-dirty #2
Hardware name: LS1012A RDB Board (DT)
Workqueue: kpcitest pci_epf_test_cmd_handler
pstate: 80000005 (Nzcv daif -PAN -UAO -TCO -DIT -SSBS BTYPE=--)
pc : __memcpy+0x168/0x230
lr : pci_epf_test_cmd_handler+0x6f0/0xa68
sp : ffff80001003bce0
x29: ffff80001003bce0 x28: ffff800010135000 x27: ffff8000101e5000
x26: ffff8000101cd000 x25: ffff6cda941cf6c8 x24: 0000000000000000
x23: ffff6cda863f2000 x22: ffff6cda9096c800 x21: ffff800010135000
x20: ffff6cda941cf680 x19: ffffaf39fd999000 x18: 0000000000000000
x17: 0000000000000000 x16: 0000000000000000 x15: ffffaf39fd2b6000
x14: 0000000000000000 x13: 15f5c8fa2f984d57 x12: 604d132b60275454
x11: 065cee5e5fb428b6 x10: aae662eb17d0cf3e x9 : 1d97c9a1b4ddef37
x8 : 7541b65edebf928c x7 : e71937c4fc595de0 x6 : b8a0e09562430d1c
x5 : ffff8000101e5401 x4 : ffff8000101cd401 x3 : ffff8000101e5380
x2 : fffffffffffffff1 x1 : ffff8000101cd3c0 x0 : ffff8000101e5000
Call trace:
__memcpy+0x168/0x230
process_one_work+0x1ec/0x370
worker_thread+0x44/0x478
kthread+0x154/0x160
ret_from_fork+0x10/0x20
Code: a984346c a9c4342c f1010042 54fffee8 (a97c3c8e)
---[ end trace 568c28c7b6336335 ]------ drivers/pci/endpoint/functions/pci-epf-test.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-)
drivers/pci/endpoint/functions/pci-epf-test.c +11 -1
@@ -285,7 +285,17 @@ static int pci_epf_test_copy(struct pci_epf_test *epf_test)if (ret)dev_err (dev,"Data transfer failed\n" ); }else { -memcpy (dst_addr, src_addr, reg->size); +void *buf; + + buf =kzalloc (reg->size,GFP_KERNEL ); +if (!buf) { + ret = -ENOMEM ; + goto err_map_addr; + } + +memcpy_fromio (buf, src_addr, reg->size); +memcpy_toio (dst_addr, buf, reg->size); +kfree (buf); }ktime_get_ts64 (&end);pci_epf_test_print_rate ("COPY" , reg->size, &start, &end, use_dma);
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 36/98 tcp: Don't acquire inet_listen_hashbucket::lock with disabled BH.
In reply to Sasha LevinFrom: Sebastian Andrzej Siewior <[email protected]>
[ Upstream commit 4f9bf2a2f5aacf988e6d5e56b961ba45c5a25248 ]
Commit
9652dc2eb9e40 ("tcp: relax listening_hash operations")
removed the need to disable bottom half while acquiring listening_hash.lock. There are still two callers left which disable bottom half before the lock is acquired.
On PREEMPT_RT the softirqs are preemptible and local_bh_disable() acts as a lock to ensure that resources, that are protected by disabling bottom halves, remain protected.
This leads to a circular locking dependency if the lock acquired with disabled bottom halves is also acquired with enabled bottom halves followed by disabling bottom halves. This is the reverse locking order. It has been observed with inet_listen_hashbucket::lock:
local_bh_disable() + spin_lock(&ilb->lock):
inet_listen()
inet_csk_listen_start()
sk->sk_prot->hash() := inet_hash()
local_bh_disable()
__inet_hash()
spin_lock(&ilb->lock);
acquire(&ilb->lock);Reverse order: spin_lock(&ilb2->lock) + local_bh_disable():
tcp_seq_next()
listening_get_next()
spin_lock(&ilb2->lock);
acquire(&ilb2->lock); tcp4_seq_show()
get_tcp4_sock()
sock_i_ino()
read_lock_bh(&sk->sk_callback_lock);
acquire(softirq_ctrl) // <---- whoops
acquire(&sk->sk_callback_lock)Drop local_bh_disable() around __inet_hash() which acquires listening_hash->lock. Split inet_unhash() and acquire the listen_hashbucket lock without disabling bottom halves; the inet_ehash lock with disabled bottom halves.
--- net/ipv4/inet_hashtables.c | 53 ++++++++++++++++++++++--------------- net/ipv6/inet6_hashtables.c | 5 +--- 2 files changed, 33 insertions(+), 25 deletions(-)
net/ipv4/inet_hashtables.c +32 -21
@@ -637,7 +637,9 @@ int __inet_hash(struct sock *sk, struct sock *osk)int err =0 ;if (sk->sk_state !=TCP_LISTEN ) { +local_bh_disable ();inet_ehash_nolisten (sk, osk,NULL ); +local_bh_enable ();return 0 ; }WARN_ON (!sk_unhashed (sk));
@@ -669,45 +671,54 @@ int inet_hash(struct sock *sk) {int err =0 ; -if (sk->sk_state !=TCP_CLOSE ) { -local_bh_disable (); +if (sk->sk_state !=TCP_CLOSE ) err =__inet_hash (sk,NULL ); -local_bh_enable (); - }return err; }EXPORT_SYMBOL_GPL (inet_hash); -void inet_unhash (struct sock *sk) +static void __inet_unhash (struct sock *sk,struct inet_listen_hashbucket *ilb) { -struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo; -struct inet_listen_hashbucket *ilb =NULL ; -spinlock_t *lock; -if (sk_unhashed (sk))return ; -if (sk->sk_state ==TCP_LISTEN ) { - ilb = &hashinfo->listening_hash[inet_sk_listen_hashfn (sk)]; - lock = &ilb->lock; - }else { - lock =inet_ehash_lockp (hashinfo, sk->sk_hash); - } -spin_lock_bh (lock); -if (sk_unhashed (sk)) - goto unlock; -if (rcu_access_pointer (sk->sk_reuseport_cb))reuseport_stop_listen_sock (sk);if (ilb) { +struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo; +inet_unhash2 (hashinfo, sk); ilb->count--; }__sk_nulls_del_node_init_rcu (sk);sock_prot_inuse_add (sock_net (sk), sk->sk_prot,-1 ); -unlock: -spin_unlock_bh (lock); +} + +void inet_unhash (struct sock *sk) +{ +struct inet_hashinfo *hashinfo = sk->sk_prot->h.hashinfo; + +if (sk_unhashed (sk)) +return ; + +if (sk->sk_state ==TCP_LISTEN ) { +struct inet_listen_hashbucket *ilb; + + ilb = &hashinfo->listening_hash[inet_sk_listen_hashfn (sk)]; +/* Don't disable bottom halves while acquiring the lock to +* avoid circular locking dependency on PREEMPT_RT. +*/ +spin_lock (&ilb->lock); +__inet_unhash (sk, ilb); +spin_unlock (&ilb->lock); + }else { +spinlock_t *lock =inet_ehash_lockp (hashinfo, sk->sk_hash); + +spin_lock_bh (lock); +__inet_unhash (sk,NULL ); +spin_unlock_bh (lock); + } }EXPORT_SYMBOL_GPL (inet_unhash);
net/ipv6/inet6_hashtables.c +1 -4
@@ -333,11 +333,8 @@ int inet6_hash(struct sock *sk) {int err =0 ; -if (sk->sk_state !=TCP_CLOSE ) { -local_bh_disable (); +if (sk->sk_state !=TCP_CLOSE ) err =__inet_hash (sk,NULL ); -local_bh_enable (); - }return err; }
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 37/98 PCI: pciehp: Add Qualcomm quirk for Command Completed erratum
In reply to Sasha LevinFrom: Manivannan Sadhasivam <[email protected]>
[ Upstream commit 9f72d4757cbe4d1ed669192f6d23817c9e437c4b ]
The Qualcomm PCI bridge device (Device ID 0x0110) found in chipsets such as SM8450 does not set the Command Completed bit unless writes to the Slot Command register change "Control" bits.
This results in timeouts like below:
pcieport 0001:00:00.0: pciehp: Timeout on hotplug command 0x03c0 (issued 2020 msec ago)
Add the device to the Command Completed quirk to mark commands "completed" immediately unless they change the "Control" bits.
--- drivers/pci/hotplug/pciehp_hpc.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/pci/hotplug/pciehp_hpc.c +2 -0
@@ -1058,6 +1058,8 @@ static void quirk_cmd_compl(struct pci_dev *pdev) }DECLARE_PCI_FIXUP_CLASS_EARLY (PCI_VENDOR_ID_INTEL ,PCI_ANY_ID ,PCI_CLASS_BRIDGE_PCI ,8 , quirk_cmd_compl); +DECLARE_PCI_FIXUP_CLASS_EARLY (PCI_VENDOR_ID_QCOM ,0x0110 , +PCI_CLASS_BRIDGE_PCI ,8 , quirk_cmd_compl);DECLARE_PCI_FIXUP_CLASS_EARLY (PCI_VENDOR_ID_QCOM ,0x0400 ,PCI_CLASS_BRIDGE_PCI ,8 , quirk_cmd_compl); DECLARE_PCI_FIXUP_CLASS_EARLY(PCI_VENDOR_ID_QCOM, 0x0401,
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 38/98 scsi: mpi3mr: Fix reporting of actual data transfer size
In reply to Sasha LevinFrom: Sreekanth Reddy <[email protected]>
[ Upstream commit 9992246127246a27cc7184f05cce6f62ac48f84e ]
The driver is missing to set the residual size while completing an I/O. Ensure proper data transfer size is reported to the kernel on I/O completion based on the transfer length reported by the firmware.
--- drivers/scsi/mpi3mr/mpi3mr_os.c | 2 ++ 1 file changed, 2 insertions(+)
drivers/scsi/mpi3mr/mpi3mr_os.c +2 -0
@@ -2204,6 +2204,8 @@ void mpi3mr_process_op_reply_desc(struct mpi3mr_ioc *mrioc, scmd->result =DID_OK <<16 ; goto out_success; } + +scsi_set_resid (scmd,scsi_bufflen (scmd) - xfer_count); if (ioc_status == MPI3_IOCSTATUS_SCSI_DATA_UNDERRUN && xfer_count == 0 && (scsi_status == MPI3_SCSI_STATUS_BUSY || scsi_status == MPI3_SCSI_STATUS_RESERVATION_CONFLICT ||
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 39/98 scsi: mpi3mr: Fix memory leaks
In reply to Sasha LevinFrom: Sreekanth Reddy <[email protected]>
[ Upstream commit d44b5fefb22e139408ae12b864da1ecb9ad9d1d2 ]
Fix memory leaks related to operational reply queue's memory segments which are not getting freed while unloading the driver.
--- drivers/scsi/mpi3mr/mpi3mr_fw.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/scsi/mpi3mr/mpi3mr_fw.c +1 -1
@@ -1275,7 +1275,7 @@ static void mpi3mr_free_op_req_q_segments(struct mpi3mr_ioc *mrioc, u16 q_idx)MPI3MR_MAX_SEG_LIST_SIZE , mrioc->req_qinfo[q_idx].q_segment_list, mrioc->req_qinfo[q_idx].q_segment_list_dma); - mrioc->op_reply_qinfo[q_idx].q_segment_list =NULL ; + mrioc->req_qinfo[q_idx].q_segment_list =NULL ; } }else size = mrioc->req_qinfo[q_idx].segment_qd *
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 40/98 powerpc/set_memory: Avoid spinlock recursion in change_page_attr()
In reply to Sasha LevinFrom: Christophe Leroy <[email protected]>
[ Upstream commit a4c182ecf33584b9b2d1aa9dad073014a504c01f ]
Commit 1f9ad21c3b38 ("powerpc/mm: Implement set_memory() routines") included a spin_lock() to change_page_attr() in order to safely perform the three step operations. But then commit 9f7853d7609d ("powerpc/mm: Fix set_memory_*() against concurrent accesses") modify it to use pte_update() and do the operation safely against concurrent access.
In the meantime, Maxime reported some spinlock recursion.
[ 15.351649] BUG: spinlock recursion on CPU#0, kworker/0:2/217 [ 15.357540] lock: init_mm+0x3c/0x420, .magic: dead4ead, .owner: kworker/0:2/217, .owner_cpu: 0 [ 15.366563] CPU: 0 PID: 217 Comm: kworker/0:2 Not tainted 5.15.0+ #523 [ 15.373350] Workqueue: events do_free_init [ 15.377615] Call Trace: [ 15.380232] [e4105ac0] [800946a4] do_raw_spin_lock+0xf8/0x120 (unreliable) [ 15.387340] [e4105ae0] [8001f4ec] change_page_attr+0x40/0x1d4 [ 15.393413] [e4105b10] [801424e0] __apply_to_page_range+0x164/0x310 [ 15.400009] [e4105b60] [80169620] free_pcp_prepare+0x1e4/0x4a0 [ 15.406045] [e4105ba0] [8016c5a0] free_unref_page+0x40/0x2b8 [ 15.411979] [e4105be0] [8018724c] kasan_depopulate_vmalloc_pte+0x6c/0x94 [ 15.418989] [e4105c00] [801424e0] __apply_to_page_range+0x164/0x310 [ 15.425451] [e4105c50] [80187834] kasan_release_vmalloc+0xbc/0x134 [ 15.431898] [e4105c70] [8015f7a8] __purge_vmap_area_lazy+0x4e4/0xdd8 [ 15.438560] [e4105d30] [80160d10] _vm_unmap_aliases.part.0+0x17c/0x24c [ 15.445283] [e4105d60] [801642d0] __vunmap+0x2f0/0x5c8 [ 15.450684] [e4105db0] [800e32d0] do_free_init+0x68/0x94 [ 15.456181] [e4105dd0] [8005d094] process_one_work+0x4bc/0x7b8 [ 15.462283] [e4105e90] [8005d614] worker_thread+0x284/0x6e8 [ 15.468227] [e4105f00] [8006aaec] kthread+0x1f0/0x210 [ 15.473489] [e4105f40] [80017148] ret_from_kernel_thread+0x14/0x1c
Remove the read / modify / write sequence to make the operation atomic and remove the spin_lock() in change_page_attr().
To do the operation atomically, we can't use pte modification helpers anymore. Because all platforms have different combination of bits, it is not easy to use those bits directly. But all have the _PAGE_KERNEL_{RO/ROX/RW/RWX} set of flags. All we need it to compare two sets to know which bits are set or cleared.
For instance, by comparing _PAGE_KERNEL_ROX and _PAGE_KERNEL_RO you know which bit gets cleared and which bit get set when changing exec permission.
--- arch/powerpc/mm/pageattr.c | 32 +++++++++++++------------------- 1 file changed, 13 insertions(+), 19 deletions(-)
arch/powerpc/mm/pageattr.c +13 -19
@@ -15,12 +15,14 @@#include <asm/pgtable.h> +static pte_basic_t pte_update_delta (pte_t *ptep,unsigned long addr, +unsigned long old,unsigned long new) +{ +return pte_update (&init_mm, addr, ptep, old & ~new, new & ~old,0 ); +} +/* -* Updates the attributes of a page in three steps: -* -* 1. take the page_table_lock -* 2. install the new entry with the updated attributes -* 3. flush the TLB +* Updates the attributes of a page atomically. * * This sequence is safe against concurrent updates, and also allows updating the * attributes of a page currently being executed or accessed.
@@ -28,41 +30,33 @@static int change_page_attr (pte_t *ptep,unsigned long addr,void *data) {long action = (long )data; -pte_t pte; - -spin_lock (&init_mm.page_table_lock); - - pte =ptep_get (ptep); -/* modify the PTE bits as desired, then apply */ +/* modify the PTE bits as desired */ switch (action) {case SET_MEMORY_RO : - pte =pte_wrprotect (pte); +/* Don't clear DIRTY bit */ +pte_update_delta (ptep, addr, _PAGE_KERNEL_RW & ~_PAGE_DIRTY, _PAGE_KERNEL_RO);break ;case SET_MEMORY_RW : - pte =pte_mkwrite (pte_mkdirty (pte)); +pte_update_delta (ptep, addr, _PAGE_KERNEL_RO, _PAGE_KERNEL_RW);break ;case SET_MEMORY_NX : - pte =pte_exprotect (pte); +pte_update_delta (ptep, addr, _PAGE_KERNEL_ROX, _PAGE_KERNEL_RO);break ;case SET_MEMORY_X : - pte =pte_mkexec (pte); +pte_update_delta (ptep, addr, _PAGE_KERNEL_RO, _PAGE_KERNEL_ROX);break ;default :WARN_ON_ONCE (1 );break ; } -pte_update (&init_mm, addr, ptep, ~0UL ,pte_val (pte),0 ); -/* See ptesync comment in radix__set_pte_at() */ if (radix_enabled ()) asmvolatile ("ptesync" : : :"memory" );flush_tlb_kernel_range (addr, addr +PAGE_SIZE ); -spin_unlock (&init_mm.page_table_lock); -return 0 ; }
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 41/98 power: supply: axp288-charger: Set Vhold to 4.4V
In reply to Sasha LevinFrom: Hans de Goede <[email protected]>
[ Upstream commit 5ac121b81b4051e7fc83d5b3456a5e499d5bd147 ]
The AXP288's recommended and factory default Vhold value (minimum input voltage below which the input current draw will be reduced) is 4.4V. This lines up with other charger IC's such as the TI bq2419x/bq2429x series which use 4.36V or 4.44V.
For some reason some BIOS-es initialize Vhold to 4.6V or even 4.7V which combined with the typical voltage drop over typically low wire gauge micro-USB cables leads to the input-current getting capped below 1A (with a 2A capable dedicated charger) based on Vhold.
This leads to slow charging, or even to the device slowly discharging if the device is in heavy use.
As the Linux AXP288 drivers use the builtin BC1.2 charger detection and send the input-current-limit according to the detected charger there really is no reason not to use the recommended 4.4V Vhold.
Set Vhold to 4.4V to fix the slow charging issue on various devices.
There is one exception, the special-case of the HP X2 2-in-1s which combine this BC1.2 capable PMIC with a Type-C port and a 5V/3A factory provided charger with a Type-C plug which does not do BC1.2. These have their input-current-limit hardcoded to 3A (like under Windows) and use a higher Vhold on purpose to limit the current when used with other chargers. To avoid touching Vhold on these HP X2 laptops the code setting Vhold is added to an else branch of the if checking for these models.
Note this also fixes the sofar unused VBUS_ISPOUT_VHOLD_SET_MASK define, which was wrong.
--- drivers/power/supply/axp288_charger.c | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-)
drivers/power/supply/axp288_charger.c +12 -2
@@ -41,11 +41,11 @@#define VBUS_ISPOUT_CUR_LIM_1500MA 0x1/* 1500mA */ #define VBUS_ISPOUT_CUR_LIM_2000MA 0x2/* 2000mA */ #define VBUS_ISPOUT_CUR_NO_LIM 0x3/* 2500mA */ -#define VBUS_ISPOUT_VHOLD_SET_MASK 0x31 +#define VBUS_ISPOUT_VHOLD_SET_MASK 0x38#define VBUS_ISPOUT_VHOLD_SET_BIT_POS 0x3#define VBUS_ISPOUT_VHOLD_SET_OFFSET 4000/* 4000mV */ #define VBUS_ISPOUT_VHOLD_SET_LSB_RES 100/* 100mV */ -#define VBUS_ISPOUT_VHOLD_SET_4300MV 0x3/* 4300mV */ +#define VBUS_ISPOUT_VHOLD_SET_4400MV 0x4/* 4400mV */ #define VBUS_ISPOUT_VBUS_PATH_DIS BIT(7)#define CHRG_CCCV_CC_MASK 0xf/* 4 bits */
@@ -744,6 +744,16 @@ static int charger_init_hw_regs(struct axp288_chrg_info *info) ret =axp288_charger_vbus_path_select (info, true);if (ret <0 )return ret; + }else { +/* Set Vhold to the factory default / recommended 4.4V */ + val =VBUS_ISPOUT_VHOLD_SET_4400MV <<VBUS_ISPOUT_VHOLD_SET_BIT_POS ; + ret =regmap_update_bits (info->regmap,AXP20X_VBUS_IPSOUT_MGMT , +VBUS_ISPOUT_VHOLD_SET_MASK , val); +if (ret <0 ) { +dev_err (&info->pdev->dev,"register(%x) write error(%d)\n" , +AXP20X_VBUS_IPSOUT_MGMT , ret); +return ret; + } }/* Read current charge voltage and current limit */
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 42/98 net/mlx5e: Disable TX queues before registering the netdev
In reply to Sasha LevinFrom: Maxim Mikityanskiy <[email protected]>
[ Upstream commit d08c6e2a4d0308a7922d7ef3b1b3af45d4096aad ]
Normally, the queues are disabled when the channels are deactivated, and enabled when the channels are activated. However, on register, the channels are not active, but the queues are enabled by default. This change fixes it, preventing mlx5e_xmit from running when the channels are deactivated in the beginning.
--- drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/mellanox/mlx5/core/en_main.c +1 -0
@@ -4914,6 +4914,7 @@ mlx5e_create_netdev(struct mlx5_core_dev *mdev, const struct mlx5e_profile *prof }netif_carrier_off (netdev); +netif_tx_disable (netdev);dev_net_set (netdev,mlx5_core_net (mdev));return netdev;
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 43/98 usb: dwc3: pci: Set the swnode from inside dwc3_pci_quirks()
In reply to Sasha LevinFrom: Hans de Goede <[email protected]>
[ Upstream commit e285cb403994419e997749c9a52b9370884ae0c8 ]
The quirk handling may need to set some different properties which means using a different swnode, move the setting of the swnode to inside dwc3_pci_quirks() so that the quirk handling can choose a different swnode.
--- drivers/usb/dwc3/dwc3-pci.c | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-)
drivers/usb/dwc3/dwc3-pci.c +4 -7
@@ -185,7 +185,8 @@ static const struct software_node dwc3_pci_amd_mr_swnode = { .properties = dwc3_pci_mr_properties, }; -static int dwc3_pci_quirks (struct dwc3_pci *dwc) +static int dwc3_pci_quirks (struct dwc3_pci *dwc, +const struct software_node *swnode) {struct pci_dev *pdev = dwc->pci;
@@ -242,7 +243,7 @@ static int dwc3_pci_quirks(struct dwc3_pci *dwc) } } -return 0 ; +return device_add_software_node (&dwc->dwc3->dev, swnode); }#ifdef CONFIG_PM
@@ -307,11 +308,7 @@ static int dwc3_pci_probe(struct pci_dev *pci, const struct pci_device_id *id) dwc->dwc3->dev.parent = dev;ACPI_COMPANION_SET (&dwc->dwc3->dev,ACPI_COMPANION (dev)); - ret =device_add_software_node (&dwc->dwc3->dev, (void *)id->driver_data); -if (ret <0 ) - goto err; - - ret =dwc3_pci_quirks (dwc); + ret =dwc3_pci_quirks (dwc, (void *)id->driver_data);if (ret) goto err;
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 44/98 iwlwifi: mvm: Correctly set fragmented EBS
In reply to Sasha LevinFrom: Ilan Peer <[email protected]>
[ Upstream commit d8d4dd26b9e0469baf5017f0544d852fd4e3fb6d ]
Currently, fragmented EBS was set for a channel only if the 'hb_type' was set to fragmented or balanced scan. However, 'hb_type' is set only in case of CDB, and thus fragmented EBS is never set for a channel for non-CDB devices. Fix it.
--- drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-)
drivers/net/wireless/intel/iwlwifi/mvm/scan.c +4 -1
@@ -1890,7 +1890,10 @@ static u8 iwl_mvm_scan_umac_chan_flags_v2(struct iwl_mvm *mvm,IWL_SCAN_CHANNEL_FLAG_CACHE_ADD ;/* set fragmented ebs for fragmented scan on HB channels */ -if (iwl_mvm_is_scan_fragmented (params->hb_type)) +if ((!iwl_mvm_is_cdb_supported (mvm) && +iwl_mvm_is_scan_fragmented (params->type)) || + (iwl_mvm_is_cdb_supported (mvm) && +iwl_mvm_is_scan_fragmented (params->hb_type))) flags |=IWL_SCAN_CHANNEL_FLAG_EBS_FRAG ;return flags;
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 45/98 iwlwifi: mvm: Passively scan non PSC channels only when requested so
In reply to Sasha LevinFrom: Ilan Peer <[email protected]>
[ Upstream commit 9966904e9472703a05861f343157cd78f47514fd ]
Non PSC channels should generally be scanned based on information about collocated APs obtained during scan on legacy bands, and otherwise should not be scanned unless specifically requested so (as there are relatively many non PSC channels, scanning them passively is time consuming and interferes with regular data traffic).
Thus, modify the scan logic to avoid passively scanning PSC channels if there is no information about collocated APs and the scan is not a passive scan.
--- drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 42 ++++++++++++++----- 1 file changed, 32 insertions(+), 10 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/scan.c +32 -10
@@ -1733,27 +1733,37 @@ iwl_mvm_umac_scan_fill_6g_chan_list(struct iwl_mvm *mvm, }/* TODO: this function can be merged with iwl_mvm_scan_umac_fill_ch_p_v6 */ -static void -iwl_mvm_umac_scan_cfg_channels_v6_6g (struct iwl_mvm_scan_params *params, +static u32 +iwl_mvm_umac_scan_cfg_channels_v6_6g (struct iwl_mvm *mvm, +struct iwl_mvm_scan_params *params,u32 n_channels,struct iwl_scan_probe_params_v4 *pp,struct iwl_scan_channel_params_v6 *cp,enum nl80211_iftype vif_type) { -struct iwl_scan_channel_cfg_umac *channel_cfg = cp->channel_config;int i;struct cfg80211_scan_6ghz_params *scan_6ghz_params = params->scan_6ghz_params; +u32 ch_cnt; -for (i =0 ; i < params->n_channels; i++) { +for (i =0 , ch_cnt =0 ; i < params->n_channels; i++) {struct iwl_scan_channel_cfg_umac *cfg = - &cp->channel_config[i]; + &cp->channel_config[ch_cnt];u32 s_ssid_bitmap =0 , bssid_bitmap =0 , flags =0 ;u8 j, k, s_max =0 , b_max =0 , n_used_bssid_entries;bool force_passive, found = false, allow_passive = true, unsolicited_probe_on_chan = false, psc_no_listen = false; +/* +* Avoid performing passive scan on non PSC channels unless the +* scan is specifically a passive scan, i.e., no SSIDs +* configured in the scan command. +*/ +if (!cfg80211_channel_is_psc (params->channels[i]) && + !params->n_6ghz_params && params->n_ssids) +continue ; + cfg->v1.channel_num = params->channels[i]->hw_value; cfg->v2.band =2 ; cfg->v2.iter_count =1 ;
@@ -1872,8 +1882,16 @@ iwl_mvm_umac_scan_cfg_channels_v6_6g(struct iwl_mvm_scan_params *params, (!flags && !cfg80211_channel_is_psc(params->channels[i]))) flags |=IWL_UHB_CHAN_CFG_FLAG_FORCE_PASSIVE ; - channel_cfg[i].flags |=cpu_to_le32 (flags); + cfg->flags |=cpu_to_le32 (flags); + ch_cnt++; } + +if (params->n_channels > ch_cnt) +IWL_DEBUG_SCAN (mvm, +"6GHz: reducing number channels: (%u->%u)\n" , + params->n_channels, ch_cnt); + +return ch_cnt; } static u8 iwl_mvm_scan_umac_chan_flags_v2(struct iwl_mvm *mvm,
@@ -2406,10 +2424,14 @@ static int iwl_mvm_scan_umac_v14(struct iwl_mvm *mvm, struct ieee80211_vif *vif,if (ret)return ret; -iwl_mvm_umac_scan_cfg_channels_v6_6g (params, - params->n_channels, - pb, cp, vif->type); - cp->count = params->n_channels; + cp->count =iwl_mvm_umac_scan_cfg_channels_v6_6g (mvm, params, + params->n_channels, + pb, cp, vif->type); +if (!cp->count) { + mvm->scan_uid_status[uid] =0 ; +return -EINVAL ; + } +if (!params->n_ssids || (params->n_ssids ==1 && !params->ssids[0 ].ssid_len)) cp->flags |=IWL_SCAN_CHANNEL_FLAG_6G_PSC_NO_FILTER ;
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 46/98 iwlwifi: mvm: move only to an enabled channel
In reply to Sasha LevinFrom: Miri Korenblit <[email protected]>
[ Upstream commit e04135c07755d001b5cde61048c69a7cc84bb94b ]
During disassociation we're decreasing the phy's ref count. If the ref count becomes 0, we're configuring the phy ctxt to the default channel (the lowest channel which the device can operate on). Currently we're not checking whether the the default channel is enabled or not. Fix it by configuring the phy ctxt to the lowest channel which is enabled.
--- .../net/wireless/intel/iwlwifi/mvm/phy-ctxt.c | 31 +++++++++++++------ 1 file changed, 22 insertions(+), 9 deletions(-)
drivers/net/wireless/intel/iwlwifi/mvm/phy-ctxt.c +22 -9
@@ -1,6 +1,6 @@// SPDX-License-Identifier: GPL-2.0 OR BSD-3-Clause /* -* Copyright (C) 2012-2014, 2018-2021 Intel Corporation +* Copyright (C) 2012-2014, 2018-2022 Intel Corporation * Copyright (C) 2013-2014 Intel Mobile Communications GmbH * Copyright (C) 2017 Intel Deutschland GmbH */
@@ -295,18 +295,31 @@ void iwl_mvm_phy_ctxt_unref(struct iwl_mvm *mvm, struct iwl_mvm_phy_ctxt *ctxt)* otherwise we might not be able to reuse this phy. */ if (ctxt->ref ==0 ) { -struct ieee80211_channel *chan; +struct ieee80211_channel *chan =NULL ;struct cfg80211_chan_def chandef; -struct ieee80211_supported_band *sband =NULL ; -enum nl80211_band band =NL80211_BAND_2GHZ ; +struct ieee80211_supported_band *sband; +enum nl80211_band band; +int channel; -while (!sband && band <NUM_NL80211_BANDS ) - sband = mvm->hw->wiphy->bands[band++]; +for (band =NL80211_BAND_2GHZ ; band <NUM_NL80211_BANDS ; band++) { + sband = mvm->hw->wiphy->bands[band]; -if (WARN_ON (!sband)) -return ; +if (!sband) +continue ; + +for (channel =0 ; channel < sband->n_channels; channel++) +if (!(sband->channels[channel].flags & +IEEE80211_CHAN_DISABLED )) { + chan = &sband->channels[channel]; +break ; + } - chan = &sband->channels[0 ]; +if (chan) +break ; + } + +if (WARN_ON (!chan)) +return ;cfg80211_chandef_create (&chandef, chan,NL80211_CHAN_NO_HT );iwl_mvm_phy_ctxt_changed (mvm, ctxt, &chandef,1 ,1 );
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 47/98 drm/msm/dsi: Remove spurious IRQF_ONESHOT flag
In reply to Sasha LevinFrom: Daniel Thompson <[email protected]>
[ Upstream commit 24b176d8827d167ac3b379317f60c0985f6e95aa ]
Quoting the header comments, IRQF_ONESHOT is "Used by threaded interrupts which need to keep the irq line disabled until the threaded handler has been run.". When applied to an interrupt that doesn't request a threaded irq then IRQF_ONESHOT has a lesser known (undocumented?) side effect, which it to disable the forced threading of irqs (and for "normal" kernels it is a nop). In this case I can find no evidence that suppressing forced threading is intentional. Had it been intentional then a driver must adopt the raw_spinlock API in order to avoid deadlocks on PREEMPT_RT kernels (and avoid calling any kernel API that uses regular spinlocks).
Fix this by removing the spurious additional flag.
This change is required for my Snapdragon 7cx Gen2 tablet to boot-to-GUI with PREEMPT_RT enabled.
--- drivers/gpu/drm/msm/dsi/dsi_host.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/msm/dsi/dsi_host.c +1 -1
@@ -1909,7 +1909,7 @@ int msm_dsi_host_init(struct msm_dsi *msm_dsi)/* do not autoenable, will be enabled later */ ret =devm_request_irq (&pdev->dev, msm_host->irq, dsi_host_irq, -IRQF_TRIGGER_HIGH |IRQF_ONESHOT |IRQF_NO_AUTOEN , +IRQF_TRIGGER_HIGH |IRQF_NO_AUTOEN ,"dsi_isr" , msm_host);if (ret <0 ) { dev_err(&pdev->dev, "failed to request IRQ%u: %d\n",
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 48/98 ipv4: Invalidate neighbour for broadcast address upon address addition
In reply to Sasha LevinFrom: Ido Schimmel <[email protected]>
[ Upstream commit 0c51e12e218f20b7d976158fdc18019627326f7a ]
In case user space sends a packet destined to a broadcast address when a matching broadcast route is not configured, the kernel will create a unicast neighbour entry that will never be resolved [1].
When the broadcast route is configured, the unicast neighbour entry will not be invalidated and continue to linger, resulting in packets being dropped.
Solve this by invalidating unresolved neighbour entries for broadcast addresses after routes for these addresses are internally configured by the kernel. This allows the kernel to create a broadcast neighbour entry following the next route lookup.
Another possible solution that is more generic but also more complex is to have the ARP code register a listener to the FIB notification chain and invalidate matching neighbour entries upon the addition of broadcast routes.
It is also possible to wave off the issue as a user space problem, but it seems a bit excessive to expect user space to be that intimately familiar with the inner workings of the FIB/neighbour kernel code.
[1] https://lore.kernel.org/netdev/[email protected]/
--- include/net/arp.h | 1 + net/ipv4/arp.c | 9 +++++++-- net/ipv4/fib_frontend.c | 5 ++++- 3 files changed, 12 insertions(+), 3 deletions(-)
include/net/arp.h +1 -0
@@ -71,6 +71,7 @@ void arp_send(int type, int ptype, __be32 dest_ip, const unsigned char *src_hw, const unsigned char *th);int arp_mc_map (__be32 addr,u8 *haddr,struct net_device *dev,int dir);void arp_ifdown (struct net_device *dev); +int arp_invalidate (struct net_device *dev,__be32 ip,bool force); struct sk_buff *arp_create(int type, int ptype, __be32 dest_ip, struct net_device *dev, __be32 src_ip,
net/ipv4/arp.c +7 -2
@@ -1116,13 +1116,18 @@ static int arp_req_get(struct arpreq *r, struct net_device *dev)return err; } -static int arp_invalidate (struct net_device *dev,__be32 ip) +int arp_invalidate (struct net_device *dev,__be32 ip,bool force) {struct neighbour *neigh =neigh_lookup (&arp_tbl, &ip, dev);int err = -ENXIO ;struct neigh_table *tbl = &arp_tbl;if (neigh) { +if ((neigh->nud_state &NUD_VALID ) && !force) { +neigh_release (neigh); +return 0 ; + } +if (neigh->nud_state & ~NUD_NOARP ) err = neigh_update(neigh, NULL, NUD_FAILED, NEIGH_UPDATE_F_OVERRIDE|
@@ -1169,7 +1174,7 @@ static int arp_req_delete(struct net *net, struct arpreq *r,if (!dev)return -EINVAL ; } -return arp_invalidate (dev, ip); +return arp_invalidate (dev, ip, true); }/*
net/ipv4/fib_frontend.c +4 -1
@@ -1112,9 +1112,11 @@ void fib_add_ifaddr(struct in_ifaddr *ifa)return ;/* Add broadcast address, if it is explicitly assigned. */ -if (ifa->ifa_broadcast && ifa->ifa_broadcast !=htonl (0xFFFFFFFF )) +if (ifa->ifa_broadcast && ifa->ifa_broadcast !=htonl (0xFFFFFFFF )) {fib_magic (RTM_NEWROUTE ,RTN_BROADCAST , ifa->ifa_broadcast,32 , prim,0 ); +arp_invalidate (dev, ifa->ifa_broadcast, false); + }if (!ipv4_is_zeronet (prefix) && !(ifa->ifa_flags &IFA_F_SECONDARY ) && (prefix != addr || ifa->ifa_prefixlen <32 )) {
@@ -1128,6 +1130,7 @@ void fib_add_ifaddr(struct in_ifaddr *ifa)if (ifa->ifa_prefixlen <31 ) {fib_magic (RTM_NEWROUTE ,RTN_BROADCAST , prefix | ~mask,32 , prim,0 ); +arp_invalidate (dev, prefix | ~mask, false); } } }
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 49/98 dm ioctl: prevent potential spectre v1 gadget
In reply to Sasha Levin--
dm-devel mailing list
[email protected]
https://listman.redhat.com/mailman/listinfo/dm-devel
Sasha Levin
maintainerPATCH 50/98 dm: requeue IO if mapping table not yet available
In reply to Sasha Levin--
dm-devel mailing list
[email protected]
https://listman.redhat.com/mailman/listinfo/dm-devel
Sasha Levin
maintainerPATCH 51/98 drm/amdkfd: make CRAT table missing message informational only
In reply to Sasha LevinFrom: Alex Deucher <[email protected]>
[ Upstream commit 9dff13f9edf755a15f6507874185a3290c1ae8bb ]
The driver has a fallback so make the message informational rather than a warning. The driver has a fallback if the Component Resource Association Table (CRAT) is missing, so make this informational now.
--- drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/amdkfd/kfd_crat.c +1 -1
@@ -1563,7 +1563,7 @@ int kfd_create_crat_image_acpi(void **crat_image, size_t *size)/* Fetch the CRAT table from ACPI */ status =acpi_get_table (CRAT_SIGNATURE ,0 , &crat_table);if (status ==AE_NOT_FOUND ) { -pr_warn ("CRAT table not found\n" ); +pr_info ("CRAT table not found\n" );return -ENODATA ; }else if (ACPI_FAILURE (status)) {const char *err =acpi_format_exception (status);
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 52/98 vfio/pci: Stub vfio_pci_vga_rw when !CONFIG_VFIO_PCI_VGA
In reply to Sasha LevinFrom: Alex Williamson <[email protected]>
[ Upstream commit 6e031ec0e5a2dda53e12e0d2a7e9b15b47a3c502 ]
Resolve build errors reported against UML build for undefined ioport_map() and ioport_unmap() functions. Without this config option a device cannot have vfio_pci_core_device.has_vga set, so the existing function would always return -EINVAL anyway.
--- drivers/vfio/pci/vfio_pci_rdwr.c | 2 ++ include/linux/vfio_pci_core.h | 9 +++++++++ 2 files changed, 11 insertions(+)
drivers/vfio/pci/vfio_pci_rdwr.c +2 -0
@@ -288,6 +288,7 @@ ssize_t vfio_pci_bar_rw(struct vfio_pci_core_device *vdev, char __user *buf,return done; } +#ifdef CONFIG_VFIO_PCI_VGA ssize_t vfio_pci_vga_rw (struct vfio_pci_core_device *vdev,char __user *buf,size_t count,loff_t *ppos,bool iswrite) {
@@ -355,6 +356,7 @@ ssize_t vfio_pci_vga_rw(struct vfio_pci_core_device *vdev, char __user *buf, return done; } +#endif static void vfio_pci_ioeventfd_do_write (struct vfio_pci_ioeventfd *ioeventfd,bool test_mem)
include/linux/vfio_pci_core.h +9 -0
@@ -159,8 +159,17 @@ extern ssize_t vfio_pci_config_rw(struct vfio_pci_core_device *vdev,extern ssize_t vfio_pci_bar_rw (struct vfio_pci_core_device *vdev,char __user *buf,size_t count,loff_t *ppos,bool iswrite); +#ifdef CONFIG_VFIO_PCI_VGA extern ssize_t vfio_pci_vga_rw (struct vfio_pci_core_device *vdev,char __user *buf,size_t count,loff_t *ppos,bool iswrite); +#else +static inline ssize_t vfio_pci_vga_rw (struct vfio_pci_core_device *vdev, +char __user *buf,size_t count, +loff_t *ppos,bool iswrite) +{ +return -EINVAL ; +} +#endif extern long vfio_pci_ioeventfd (struct vfio_pci_core_device *vdev,loff_t offset,uint64_t data,int count,int fd);
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 53/98 scsi: pm8001: Fix pm80xx_pci_mem_copy() interface
In reply to Sasha LevinFrom: Damien Le Moal <[email protected]>
[ Upstream commit 3762d8f6edcdb03994c919f9487fd6d336c06561 ]
The declaration of the local variable destination1 in pm80xx_pci_mem_copy() as a pointer to a u32 results in the sparse warning:
warning: incorrect type in assignment (different base types)
expected unsigned int [usertype]
got restricted __le32 [usertype]
Furthermore, the destination" argument of pm80xx_pci_mem_copy() is wrongly declared with the const attribute.
Fix both problems by changing the type of the "destination" argument to "__le32 *" and use this argument directly inside the pm80xx_pci_mem_copy() function, thus removing the need for the destination1 local variable.
--- drivers/scsi/pm8001/pm80xx_hwi.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-)
drivers/scsi/pm8001/pm80xx_hwi.c +3 -5
@@ -66,18 +66,16 @@ int pm80xx_bar4_shift(struct pm8001_hba_info *pm8001_ha, u32 shift_value) }static void pm80xx_pci_mem_copy (struct pm8001_hba_info *pm8001_ha,u32 soffset, -const void *destination, +__le32 *destination,u32 dw_count,u32 bus_base_number) {u32 index, value, offset; -u32 *destination1; - destination1 = (u32 *)destination; -for (index =0 ; index < dw_count; index +=4 , destination1++) { +for (index =0 ; index < dw_count; index +=4 , destination++) { offset = (soffset + index);if (offset < (64 *1024 )) { value =pm8001_cr32 (pm8001_ha, bus_base_number, offset); - *destination1 =cpu_to_le32 (value); + *destination =cpu_to_le32 (value); } }return ;
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 54/98 scsi: pm8001: Fix pm8001_mpi_task_abort_resp()
In reply to Sasha LevinFrom: Damien Le Moal <[email protected]>
[ Upstream commit 7e6b7e740addcea450041b5be8e42f0a4ceece0f ]
The call to pm8001_ccb_task_free() at the end of pm8001_mpi_task_abort_resp() already frees the ccb tag. So when the device NCQ_ABORT_ALL_FLAG is set, the tag should not be freed again. Also change the hardcoded 0xBFFFFFFF value to ~NCQ_ABORT_ALL_FLAG as it ought to be.
--- drivers/scsi/pm8001/pm8001_hwi.c | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-)
drivers/scsi/pm8001/pm8001_hwi.c +3 -4
@@ -3710,12 +3710,11 @@ int pm8001_mpi_task_abort_resp(struct pm8001_hba_info *pm8001_ha, void *piomb)mb ();if (pm8001_dev->id &NCQ_ABORT_ALL_FLAG ) { -pm8001_tag_free (pm8001_ha, tag);sas_free_task (t); -/* clear the flag */ - pm8001_dev->id &=0xBFFFFFFF ; - }else + pm8001_dev->id &= ~NCQ_ABORT_ALL_FLAG ; + }else { t->task_done (t); + }return 0 ; }
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 55/98 scsi: pm8001: Fix task leak in pm8001_send_abort_all()
In reply to Sasha LevinFrom: Damien Le Moal <[email protected]>
[ Upstream commit f90a74892f3acf0cdec5844e90fc8686ca13e7d7 ]
In pm8001_send_abort_all(), make sure to free the allocated sas task if pm8001_tag_alloc() or pm8001_mpi_build_cmd() fail.
--- drivers/scsi/pm8001/pm8001_hwi.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
drivers/scsi/pm8001/pm8001_hwi.c +6 -3
@@ -1767,7 +1767,6 @@ static void pm8001_send_abort_all(struct pm8001_hba_info *pm8001_ha, } task =sas_alloc_slow_task (GFP_ATOMIC ); -if (!task) {pm8001_dbg (pm8001_ha,FAIL ,"cannot allocate task\n" );return ;
@@ -1776,8 +1775,10 @@ static void pm8001_send_abort_all(struct pm8001_hba_info *pm8001_ha, task->task_done = pm8001_task_done; res =pm8001_tag_alloc (pm8001_ha, &ccb_tag); -if (res) +if (res) { +sas_free_task (task);return ; + } ccb = &pm8001_ha->ccb_info[ccb_tag]; ccb->device = pm8001_ha_dev;
@@ -1793,8 +1794,10 @@ static void pm8001_send_abort_all(struct pm8001_hba_info *pm8001_ha, ret =pm8001_mpi_build_cmd (pm8001_ha, circularQ, opc, &task_abort,sizeof (task_abort),0 ); -if (ret) +if (ret) { +sas_free_task (task);pm8001_tag_free (pm8001_ha, ccb_tag); + } }
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 56/98 scsi: pm8001: Fix tag leaks on error
In reply to Sasha LevinFrom: Damien Le Moal <[email protected]>
[ Upstream commit 4c8f04b1905cd4b776d0b720463c091545478ef7 ]
In pm8001_chip_set_dev_state_req(), pm8001_chip_fw_flash_update_req(), pm80xx_chip_phy_ctl_req() and pm8001_chip_reg_dev_req() add missing calls to pm8001_tag_free() to free the allocated tag when pm8001_mpi_build_cmd() fails.
Similarly, in pm8001_exec_internal_task_abort(), if the chip ->task_abort method fails, the tag allocated for the abort request task must be freed. Add the missing call to pm8001_tag_free().
--- drivers/scsi/pm8001/pm8001_hwi.c | 9 +++++++++ drivers/scsi/pm8001/pm8001_sas.c | 2 +- drivers/scsi/pm8001/pm80xx_hwi.c | 9 +++++++-- 3 files changed, 17 insertions(+), 3 deletions(-)
drivers/scsi/pm8001/pm8001_hwi.c +9 -0
@@ -4485,6 +4485,9 @@ static int pm8001_chip_reg_dev_req(struct pm8001_hba_info *pm8001_ha, SAS_ADDR_SIZE); rc =pm8001_mpi_build_cmd (pm8001_ha, circularQ, opc, &payload,sizeof (payload),0 ); +if (rc) +pm8001_tag_free (pm8001_ha, tag); +return rc; }
@@ -4897,6 +4900,9 @@ pm8001_chip_fw_flash_update_req(struct pm8001_hba_info *pm8001_ha, ccb->ccb_tag = tag; rc =pm8001_chip_fw_flash_update_build (pm8001_ha, &flash_update_info, tag); +if (rc) +pm8001_tag_free (pm8001_ha, tag); +return rc; }
@@ -5001,6 +5007,9 @@ pm8001_chip_set_dev_state_req(struct pm8001_hba_info *pm8001_ha, payload.nds =cpu_to_le32 (state); rc =pm8001_mpi_build_cmd (pm8001_ha, circularQ, opc, &payload,sizeof (payload),0 ); +if (rc) +pm8001_tag_free (pm8001_ha, tag); +return rc; }
drivers/scsi/pm8001/pm8001_sas.c +1 -1
@@ -831,10 +831,10 @@ pm8001_exec_internal_task_abort(struct pm8001_hba_info *pm8001_ha, res =PM8001_CHIP_DISP ->task_abort (pm8001_ha, pm8001_dev, flag, task_tag, ccb_tag); -if (res) {del_timer (&task->slow_task->timer);pm8001_dbg (pm8001_ha,FAIL ,"Executing internal task failed\n" ); +pm8001_tag_free (pm8001_ha, ccb_tag); goto ex_err; }wait_for_completion (&task->slow_task->completion);
drivers/scsi/pm8001/pm80xx_hwi.c +7 -2
@@ -4901,8 +4901,13 @@ static int pm80xx_chip_phy_ctl_req(struct pm8001_hba_info *pm8001_ha, payload.tag =cpu_to_le32 (tag); payload.phyop_phyid =cpu_to_le32 (((phy_op &0xFF ) <<8 ) | (phyId &0xFF )); -return pm8001_mpi_build_cmd (pm8001_ha, circularQ, opc, &payload, -sizeof (payload),0 ); + + rc =pm8001_mpi_build_cmd (pm8001_ha, circularQ, opc, &payload, +sizeof (payload),0 ); +if (rc) +pm8001_tag_free (pm8001_ha, tag); + +return rc; }static u32 pm80xx_chip_is_our_interrupt (struct pm8001_hba_info *pm8001_ha)
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 57/98 scsi: pm8001: Fix memory leak in pm8001_chip_fw_flash_update_req()
In reply to Sasha LevinFrom: Damien Le Moal <[email protected]>
[ Upstream commit f792a3629f4c4aa4c3703d66b43ce1edcc3ec09a ]
In pm8001_chip_fw_flash_update_build(), if pm8001_chip_fw_flash_update_build() fails, the struct fw_control_ex allocated must be freed.
--- drivers/scsi/pm8001/pm8001_hwi.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/scsi/pm8001/pm8001_hwi.c +3 -1
@@ -4900,8 +4900,10 @@ pm8001_chip_fw_flash_update_req(struct pm8001_hba_info *pm8001_ha, ccb->ccb_tag = tag; rc =pm8001_chip_fw_flash_update_build (pm8001_ha, &flash_update_info, tag); -if (rc) +if (rc) { +kfree (fw_control_context);pm8001_tag_free (pm8001_ha, tag); + }return rc; }
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 58/98 mt76: mt7915: fix injected MPDU transmission to not use HW A-MSDU
In reply to Sasha LevinFrom: Johan Almbladh <[email protected]>
[ Upstream commit 28225a6ef80ebf46c46e5fbd5b1ee231a0b2b5b7 ]
Before, the hardware would be allowed to transmit injected 802.11 MPDUs as A-MSDU. This resulted in corrupted frames being transmitted. Now, injected MPDUs are transmitted as-is, without A-MSDU.
The fix was verified with frame injection on MT7915 hardware, both with and without the injected frame being encrypted.
If the hardware cannot do A-MSDU aggregation on MPDUs, this problem would also be present in the TX path where mac80211 does the 802.11 encapsulation. However, I have not observed any such problem when disabling IEEE80211_HW_SUPPORTS_TX_ENCAP_OFFLOAD to force that mode. Therefore this fix is isolated to injected frames only.
The same A-MSDU logic is also present in the mt7921 driver, so it is likely that this fix should be applied there too. I do not have access to mt7921 hardware so I have not been able to test that.
--- drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/wireless/mediatek/mt76/mt7915/mac.c +1 -0
@@ -899,6 +899,7 @@ mt7915_mac_write_txwi_80211(struct mt7915_dev *dev, __le32 *txwi, val =MT_TXD3_SN_VALID |FIELD_PREP (MT_TXD3_SEQ ,IEEE80211_SEQ_TO_SN (seqno)); txwi[3 ] |=cpu_to_le32 (val); + txwi[7 ] &= ~cpu_to_le32 (MT_TXD7_HW_AMSDU ); } val = FIELD_PREP(MT_TXD7_TYPE, fc_type) |
Signature · 7 lines
2.34.1 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
Sasha Levin
maintainerPATCH 59/98 drm/simpledrm: Add "panel orientation" property on non-upright mounted LCD panels
In reply to Sasha LevinFrom: Hans de Goede <[email protected]>
[ Upstream commit 94fa115f7b28a3f02611499175e134f0a823b686 ]
Some devices use e.g. a portrait panel in a standard laptop casing made for landscape panels. efifb calls drm_get_panel_orientation_quirk() and sets fb_info.fbcon_rotate_hint to make fbcon rotate the console so that it shows up-right instead of on its side.
When switching to simpledrm the fbcon renders on its side. Call the drm_connector_set_panel_orientation_with_quirk() helper to add a "panel orientation" property on devices listed in the quirk table, to make the fbcon (and aware userspace apps) rotate the image to display properly.
--- drivers/gpu/drm/tiny/simpledrm.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/gpu/drm/tiny/simpledrm.c +3 -0
@@ -779,6 +779,9 @@ static int simpledrm_device_init_modeset(struct simpledrm_device *sdev)if (ret)return ret;drm_connector_helper_add (connector, &simpledrm_connector_helper_funcs); +drm_connector_set_panel_orientation_with_quirk (connector, +DRM_MODE_PANEL_ORIENTATION_UNKNOWN , + mode->hdisplay, mode->vdisplay); formats =simpledrm_device_formats (sdev, &nformats);
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 60/98 powerpc/64s/hash: Make hash faults work in NMI context
In reply to Sasha LevinFrom: Nicholas Piggin <[email protected]>
[ Upstream commit 8b91cee5eadd2021f55e6775f2d50bd56d00c217 ]
Hash faults are not resoved in NMI context, instead causing the access to fail. This is done because perf interrupts can get backtraces including walking the user stack, and taking a hash fault on those could deadlock on the HPTE lock if the perf interrupt hits while the same HPTE lock is being held by the hash fault code. The user-access for the stack walking will notice the access failed and deal with that in the perf code.
The reason to allow perf interrupts in is to better profile hash faults.
The problem with this is any hash fault on a kernel access that happens in NMI context will crash, because kernel accesses must not fail.
Hard lockups, system reset, machine checks that access vmalloc space including modules and including stack backtracing and symbol lookup in modules, per-cpu data, etc could all run into this problem.
Fix this by disallowing perf interrupts in the hash fault code (the direct hash fault is covered by MSR[EE]=0 so the PMI disable just needs to extend to the preload case). This simplifies the tricky logic in hash faults and perf, at the cost of reduced profiling of hash faults.
perf can still latch addresses when interrupts are disabled, it just won't get the stack trace at that point, so it would still find hot spots, just sometimes with confusing stack chains.
An alternative could be to allow perf interrupts here but always do the slowpath stack walk if we are in nmi context, but that slows down all perf interrupt stack walking on hash though and it does not remove as much tricky code.
--- arch/powerpc/include/asm/interrupt.h | 2 +- arch/powerpc/mm/book3s64/hash_utils.c | 54 ++++----------------------- arch/powerpc/perf/callchain.h | 9 +---- arch/powerpc/perf/callchain_64.c | 27 -------------- 4 files changed, 10 insertions(+), 82 deletions(-)
arch/powerpc/include/asm/interrupt.h +1 -1
@@ -567,7 +567,7 @@ DECLARE_INTERRUPT_HANDLER_RAW(do_slb_fault);DECLARE_INTERRUPT_HANDLER (do_bad_slb_fault);/* hash_utils.c */ -DECLARE_INTERRUPT_HANDLER_RAW (do_hash_fault); +DECLARE_INTERRUPT_HANDLER (do_hash_fault);/* fault.c */ DECLARE_INTERRUPT_HANDLER (do_page_fault);
arch/powerpc/mm/book3s64/hash_utils.c +8 -46
84 lines not on this page · raw message
arch/powerpc/perf/callchain.h +1 -8
@@ -2,7 +2,6 @@#ifndef _POWERPC_PERF_CALLCHAIN_H#define _POWERPC_PERF_CALLCHAIN_H -int read_user_stack_slow (const void __user *ptr,void *buf,int nb);void perf_callchain_user_64 (struct perf_callchain_entry_ctx *entry,struct pt_regs *regs); void perf_callchain_user_32(struct perf_callchain_entry_ctx *entry,
@@ -26,17 +25,11 @@ static inline int __read_user_stack(const void __user *ptr, void *ret, size_t size) {unsigned long addr = (unsigned long )ptr; -int rc;if (addr >TASK_SIZE - size || (addr & (size -1 )))return -EFAULT ; - rc =copy_from_user_nofault (ret, ptr, size); - -if (IS_ENABLED (CONFIG_PPC64 ) && !radix_enabled () && rc) -return read_user_stack_slow (ptr, ret, size); - -return rc; +return copy_from_user_nofault (ret, ptr, size); }#endif /* _POWERPC_PERF_CALLCHAIN_H */
arch/powerpc/perf/callchain_64.c +0 -27
@@ -18,33 +18,6 @@#include "callchain.h" -/* -* On 64-bit we don't want to invoke hash_page on user addresses from -* interrupt context, so if the access faults, we read the page tables -* to find which page (if any) is mapped and access it directly. Radix -* has no need for this so it doesn't use read_user_stack_slow. -*/ -int read_user_stack_slow (const void __user *ptr,void *buf,int nb) -{ - -unsigned long addr = (unsigned long ) ptr; -unsigned long offset; -struct page *page; -void *kaddr; - -if (get_user_page_fast_only (addr,FOLL_WRITE , &page)) { - kaddr =page_address (page); - -/* align address to page boundary */ - offset = addr & ~PAGE_MASK ; - -memcpy (buf, kaddr + offset, nb); -put_page (page); -return 0 ; - } -return -EFAULT ; -} -static int read_user_stack_64 (const unsigned long __user *ptr,unsigned long *ret) {return __read_user_stack (ptr, ret,sizeof (*ret));
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 61/98 mt76: mt7615: Fix assigning negative values to unsigned variable
In reply to Sasha LevinFrom: Yang Li <[email protected]>
[ Upstream commit 9273ffcc9a11942bd586bb42584337ef3962b692 ]
Smatch reports the following:drivers/net/wireless/mediatek/mt76/mt7615/mac.c:1865 mt7615_mac_adjust_sensitivity() warn: assigning (-110) to unsigned variable 'def_th' drivers/net/wireless/mediatek/mt76/mt7615/mac.c:1865 mt7615_mac_adjust_sensitivity() warn: assigning (-98) to unsigned variable 'def_th'
--- drivers/net/wireless/mediatek/mt76/mt7615/mac.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt7615/mac.c +1 -1
@@ -1732,7 +1732,7 @@ mt7615_mac_adjust_sensitivity(struct mt7615_phy *phy,struct mt7615_dev *dev = phy->dev;int false_cca = ofdm ? phy->false_cca_ofdm : phy->false_cca_cck;bool ext_phy = phy != &dev->phy; -u16 def_th = ofdm ?-98 :-110 ; +s16 def_th = ofdm ?-98 :-110 ;bool update = false;s8 *sensitivity;int signal;
Signature · 7 lines
2.34.1 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
Sasha Levin
maintainerPATCH 62/98 scsi: aha152x: Fix aha152x_setup() __setup handler return value
In reply to Sasha LevinFrom: Randy Dunlap <[email protected]>
[ Upstream commit cc8294ec4738d25e2bb2d71f7d82a9bf7f4a157b ]
__setup() handlers should return 1 if the command line option is handled and 0 if not (or maybe never return 0; doing so just pollutes init's environment with strings that are not init arguments/parameters).
Return 1 from aha152x_setup() to indicate that the boot option has been handled.
--- drivers/scsi/aha152x.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)
drivers/scsi/aha152x.c +2 -4
@@ -3370,13 +3370,11 @@ static int __init aha152x_setup(char *str) setup[setup_count].synchronous = ints[0 ] >=6 ? ints[6 ] :1 ; setup[setup_count].delay = ints[0 ] >=7 ? ints[7 ] :DELAY_DEFAULT ; setup[setup_count].ext_trans = ints[0 ] >=8 ? ints[8 ] :0 ; -if (ints[0 ] >8 ) {/*}*/ +if (ints[0 ] >8 )printk (KERN_NOTICE "aha152x: usage: aha152x=<IOBASE>[,<IRQ>[,<SCSI ID>" "[,<RECONNECT>[,<PARITY>[,<SYNCHRONOUS>[,<DELAY>[,<EXT_TRANS>]]]]]]]\n" ); - }else { +else setup_count++; -return 0 ; - }return 1 ; }
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 63/98 scsi: hisi_sas: Free irq vectors in order for v3 HW
In reply to Sasha LevinFrom: Qi Liu <[email protected]>
[ Upstream commit 554fb72ee34f4732c7f694f56c3c6e67790352a0 ]
If the driver probe fails to request the channel IRQ or fatal IRQ, the driver will free the IRQ vectors before freeing the IRQs in free_irq(), and this will cause a kernel BUG like this:
------------[ cut here ]------------ kernel BUG at drivers/pci/msi.c:369! Internal error: Oops - BUG: 0 [#1] PREEMPT SMP Call trace: free_msi_irqs+0x118/0x13c pci_disable_msi+0xfc/0x120 pci_free_irq_vectors+0x24/0x3c hisi_sas_v3_probe+0x360/0x9d0 [hisi_sas_v3_hw] local_pci_probe+0x44/0xb0 work_for_cpu_fn+0x20/0x34 process_one_work+0x1d0/0x340 worker_thread+0x2e0/0x460 kthread+0x180/0x190 ret_from_fork+0x10/0x20 ---[ end trace b88990335b610c11 ]---
So we use devm_add_action() to control the order in which we free the vectors.
--- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-)
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +11 -5
@@ -2392,17 +2392,25 @@ static irqreturn_t cq_interrupt_v3_hw(int irq_no, void *p)return IRQ_WAKE_THREAD ; } +static void hisi_sas_v3_free_vectors (void *data) +{ +struct pci_dev *pdev = data; + +pci_free_irq_vectors (pdev); +} +static int interrupt_preinit_v3_hw (struct hisi_hba *hisi_hba) {int vectors;int max_msi =HISI_SAS_MSI_COUNT_V3_HW , min_msi;struct Scsi_Host *shost = hisi_hba->shost; +struct pci_dev *pdev = hisi_hba->pci_dev;struct irq_affinity desc = { .pre_vectors =BASE_VECTORS_V3_HW , }; min_msi =MIN_AFFINE_VECTORS_V3_HW ; - vectors = pci_alloc_irq_vectors_affinity(hisi_hba->pci_dev, + vectors = pci_alloc_irq_vectors_affinity(pdev, min_msi, max_msi, PCI_IRQ_MSI | PCI_IRQ_AFFINITY,
@@ -2414,6 +2422,7 @@ static int interrupt_preinit_v3_hw(struct hisi_hba *hisi_hba) hisi_hba->cq_nvecs = vectors -BASE_VECTORS_V3_HW ; shost->nr_hw_queues = hisi_hba->cq_nvecs; +devm_add_action (&pdev->dev, hisi_sas_v3_free_vectors, pdev);return 0 ; }
@@ -4763,7 +4772,7 @@ hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id)dev_err (dev,"%d hw queues\n" , shost->nr_hw_queues); rc =scsi_add_host (shost, dev);if (rc) - goto err_out_free_irq_vectors; + goto err_out_debugfs; rc =sas_register_ha (sha);if (rc)
@@ -4792,8 +4801,6 @@ hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id)sas_unregister_ha (sha); err_out_register_ha:scsi_remove_host (shost); -err_out_free_irq_vectors: -pci_free_irq_vectors (pdev); err_out_debugfs:debugfs_exit_v3_hw (hisi_hba); err_out_ha:
@@ -4821,7 +4828,6 @@ hisi_sas_v3_destroy_irqs(struct pci_dev *pdev, struct hisi_hba *hisi_hba)devm_free_irq (&pdev->dev,pci_irq_vector (pdev, nr), cq); } -pci_free_irq_vectors (pdev); }static void hisi_sas_v3_remove (struct pci_dev *pdev)
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 64/98 scsi: hisi_sas: Limit users changing debugfs BIST count value
In reply to Sasha LevinFrom: Xiang Chen <[email protected]>
[ Upstream commit 286ce4c65fbdf5eb9d4d5f4e4997c4e32bf1b073 ]
Add a file operation for "cnt" file under bist directory, so users can only read "cnt" or clear "cnt" to zero, but cannot randomly modify.
--- drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 52 +++++++++++++++++++++++++- 1 file changed, 50 insertions(+), 2 deletions(-)
drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +50 -2
@@ -3968,6 +3968,54 @@ static const struct file_operations debugfs_bist_phy_v3_hw_fops = { .owner = THIS_MODULE, }; +static ssize_t debugfs_bist_cnt_v3_hw_write (struct file *filp, +const char __user *buf, +size_t count,loff_t *ppos) +{ +struct seq_file *m = filp->private_data; +struct hisi_hba *hisi_hba = m->private; +unsigned int cnt; +int val; + +if (hisi_hba->debugfs_bist_enable) +return -EPERM ; + + val =kstrtouint_from_user (buf, count,0 , &cnt); +if (val) +return val; + +if (cnt) +return -EINVAL ; + + hisi_hba->debugfs_bist_cnt =0 ; +return count; +} + +static int debugfs_bist_cnt_v3_hw_show (struct seq_file *s,void *p) +{ +struct hisi_hba *hisi_hba = s->private; + +seq_printf (s,"%u\n" , hisi_hba->debugfs_bist_cnt); + +return 0 ; +} + +static int debugfs_bist_cnt_v3_hw_open (struct inode *inode, +struct file *filp) +{ +return single_open (filp, debugfs_bist_cnt_v3_hw_show, + inode->i_private); +} + +static const struct file_operations debugfs_bist_cnt_v3_hw_ops = { + .open = debugfs_bist_cnt_v3_hw_open, + .read = seq_read, + .write = debugfs_bist_cnt_v3_hw_write, + .llseek = seq_lseek, + .release = single_release, + .owner =THIS_MODULE , +}; + static const struct { int value; char *name;
@@ -4605,8 +4653,8 @@ static void debugfs_bist_init_v3_hw(struct hisi_hba *hisi_hba)debugfs_create_file ("phy_id" ,0600 , hisi_hba->debugfs_bist_dentry, hisi_hba, &debugfs_bist_phy_v3_hw_fops); -debugfs_create_u32 ("cnt" ,0600 , hisi_hba->debugfs_bist_dentry, - &hisi_hba->debugfs_bist_cnt); +debugfs_create_file ("cnt" ,0600 , hisi_hba->debugfs_bist_dentry, + hisi_hba, &debugfs_bist_cnt_v3_hw_ops); debugfs_create_file("loopback_mode", 0600, hisi_hba->debugfs_bist_dentry,
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 65/98 net/smc: correct settings of RMB window update limit
In reply to Sasha LevinFrom: Dust Li <[email protected]>
[ Upstream commit 6bf536eb5c8ca011d1ff57b5c5f7c57ceac06a37 ]
rmbe_update_limit is used to limit announcing receive window updating too frequently. RFC7609 request a minimal increase in the window size of 10% of the receive buffer space. But current implementation used:
min_t(int, rmbe_size / 10, SOCK_MIN_SNDBUF / 2)
and SOCK_MIN_SNDBUF / 2 == 2304 Bytes, which is almost always less then 10% of the receive buffer space.
This causes the receiver always sending CDC message to update its consumer cursor when it consumes more then 2K of data. And as a result, we may encounter something like "TCP silly window syndrome" when sending 2.5~8K message.
This patch fixes this using max(rmbe_size / 10, SOCK_MIN_SNDBUF / 2).
With this patch and SMC autocorking enabled, qperf 2K/4K/8K tcp_bw test shows 45%/75%/40% increase in throughput respectively.
--- net/smc/smc_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/smc/smc_core.c +1 -1
@@ -1822,7 +1822,7 @@ static struct smc_buf_desc *smc_buf_get_slot(int compressed_bufsize,*/ static inline int smc_rmb_wnd_update_limit (int rmbe_size) { -return min_t (int, rmbe_size /10 ,SOCK_MIN_SNDBUF /2 ); +return max_t (int, rmbe_size /10 ,SOCK_MIN_SNDBUF /2 ); }/* map an rmb buf to a link */
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 66/98 mips: ralink: fix a refcount leak in ill_acc_of_setup()
In reply to Sasha LevinFrom: Hangyu Hua <[email protected]>
[ Upstream commit 4a0a1436053b17e50b7c88858fb0824326641793 ]
of_node_put(np) needs to be called when pdev == NULL.
--- arch/mips/ralink/ill_acc.c | 1 + 1 file changed, 1 insertion(+)
arch/mips/ralink/ill_acc.c +1 -0
@@ -61,6 +61,7 @@ static int __init ill_acc_of_setup(void) pdev =of_find_device_by_node (np);if (!pdev) {pr_err ("%pOFn: failed to lookup pdev\n" , np); +of_node_put (np);return -EINVAL ; }
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 67/98 macvtap: advertise link netns via netlink
In reply to Sasha LevinFrom: Sven Eckelmann <[email protected]>
[ Upstream commit a02192151b7dbf855084c38dca380d77c7658353 ]
Assign rtnl_link_ops->get_link_net() callback so that IFLA_LINK_NETNSID is added to rtnetlink messages. This fixes iproute2 which otherwise resolved the link interface to an interface in the wrong namespace.
Test commands:
ip netns add nst
ip link add dummy0 type dummy
ip link add link macvtap0 link dummy0 type macvtap ip link set macvtap0 netns nst
ip -netns nst link show macvtap0
Before:
10: macvtap0@gre0: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 500
link/ether 5e:8f:ae:1d:60:50 brd ff:ff:ff:ff:ff:ff
After:
10: macvtap0@if2: <BROADCAST,MULTICAST> mtu 1500 qdisc noop state DOWN mode DEFAULT group default qlen 500
link/ether 5e:8f:ae:1d:60:50 brd ff:ff:ff:ff:ff:ff link-netnsid 0
--- drivers/net/macvtap.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/macvtap.c +6 -0
@@ -133,11 +133,17 @@ static void macvtap_setup(struct net_device *dev) dev->tx_queue_len =TUN_READQ_SIZE ; } +static struct net *macvtap_link_net (const struct net_device *dev) +{ +return dev_net (macvlan_dev_real_dev (dev)); +} +static struct rtnl_link_ops macvtap_link_ops__read_mostly = { .kind ="macvtap" , .setup = macvtap_setup, .newlink = macvtap_newlink, .dellink = macvtap_dellink, + .get_link_net = macvtap_link_net, .priv_size =sizeof (struct macvtap_dev ), };
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 68/98 tuntap: add sanity checks about msg_controllen in sendmsg
In reply to Sasha LevinFrom: Harold Huang <[email protected]>
[ Upstream commit 74a335a07a17d131b9263bfdbdcb5e40673ca9ca ]
In patch [1], tun_msg_ctl was added to allow pass batched xdp buffers to tun_sendmsg. Although we donot use msg_controllen in this path, we should check msg_controllen to make sure the caller pass a valid msg_ctl.
--- drivers/net/tap.c | 3 ++- drivers/net/tun.c | 3 ++- drivers/vhost/net.c | 1 + 3 files changed, 5 insertions(+), 2 deletions(-)
drivers/net/tap.c +2 -1
@@ -1198,7 +1198,8 @@ static int tap_sendmsg(struct socket *sock, struct msghdr *m,struct xdp_buff *xdp;int i; -if (ctl && (ctl->type ==TUN_MSG_PTR )) { +if (m->msg_controllen ==sizeof (struct tun_msg_ctl ) && + ctl && ctl->type ==TUN_MSG_PTR ) {for (i =0 ; i < ctl->num; i++) { xdp = &((struct xdp_buff *)ctl->ptr)[i];tap_get_user_xdp (q, xdp);
drivers/net/tun.c +2 -1
@@ -2489,7 +2489,8 @@ static int tun_sendmsg(struct socket *sock, struct msghdr *m, size_t total_len)if (!tun)return -EBADFD ; -if (ctl && (ctl->type ==TUN_MSG_PTR )) { +if (m->msg_controllen ==sizeof (struct tun_msg_ctl ) && + ctl && ctl->type ==TUN_MSG_PTR ) {struct tun_page tpage;int n = ctl->num;int flush =0 ;
drivers/vhost/net.c +1 -0
@@ -473,6 +473,7 @@ static void vhost_tx_batch(struct vhost_net *net, goto signal_used; msghdr->msg_control = &ctl; + msghdr->msg_controllen =sizeof (ctl); err = sock->ops->sendmsg (sock, msghdr,0 );if (unlikely (err <0 )) {vq_err (&nvq->vq,"Fail to batch sending packets\n" );
Signature · 6 lines
2.34.1 _______________________________________________ Virtualization mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/virtualization
Sasha Levin
maintainerPATCH 69/98 iommu/iova: Improve 32-bit free space estimate
In reply to Sasha LevinFrom: Robin Murphy <[email protected]>
[ Upstream commit 5b61343b50590fb04a3f6be2cdc4868091757262 ]
For various reasons based on the allocator behaviour and typical use-cases at the time, when the max32_alloc_size optimisation was introduced it seemed reasonable to couple the reset of the tracked size to the update of cached32_node upon freeing a relevant IOVA. However, since subsequent optimisations focused on helping genuine 32-bit devices make best use of even more limited address spaces, it is now a lot more likely for cached32_node to be anywhere in a "full" 32-bit address space, and as such more likely for space to become available from IOVAs below that node being freed.
At this point, the short-cut in __cached_rbnode_delete_update() really doesn't hold up any more, and we need to fix the logic to reliably provide the expected behaviour. We still want cached32_node to only move upwards, but we should reset the allocation size if *any* 32-bit space has become available.
--- drivers/iommu/iova.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)
drivers/iommu/iova.c +3 -2
@@ -154,10 +154,11 @@ __cached_rbnode_delete_update(struct iova_domain *iovad, struct iova *free) cached_iova =to_iova (iovad->cached32_node);if (free == cached_iova || (free->pfn_hi < iovad->dma_32bit_pfn && - free->pfn_lo >= cached_iova->pfn_lo)) { + free->pfn_lo >= cached_iova->pfn_lo)) iovad->cached32_node =rb_next (&free->node); + +if (free->pfn_lo < iovad->dma_32bit_pfn) iovad->max32_alloc_size = iovad->dma_32bit_pfn; - } cached_iova =to_iova (iovad->cached_node);if (free->pfn_lo >= cached_iova->pfn_lo)
Signature · 6 lines
2.34.1 _______________________________________________ iommu mailing list [email protected] https://lists.linuxfoundation.org/mailman/listinfo/iommu
Sasha Levin
maintainerPATCH 70/98 Bluetooth: Fix not checking for valid hdev on bt_dev_{info,warn,err,dbg}
In reply to Sasha LevinFrom: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit 9b392e0e0b6d026da5a62bb79a08f32e27af858e ]
This fixes attemting to print hdev->name directly which causes them to print an error:
kernel: read_version:367: (efault): sock 000000006a3008f2
--- include/net/bluetooth/bluetooth.h | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)
include/net/bluetooth/bluetooth.h +8 -6
@@ -180,19 +180,21 @@ void bt_err_ratelimited(const char *fmt, ...);#define BT_DBG (fmt, ...) pr_debug(fmt "\n", ##__VA_ARGS__)#endif +#define bt_dev_name (hdev) ((hdev) ? (hdev)->name : "null") +#define bt_dev_info (hdev, fmt, ...) \ - BT_INFO("%s: " fmt, (hdev)->name, ##__VA_ARGS__) + BT_INFO("%s: " fmt, bt_dev_name(hdev), ##__VA_ARGS__)#define bt_dev_warn (hdev, fmt, ...) \ - BT_WARN("%s: " fmt, (hdev)->name, ##__VA_ARGS__) + BT_WARN("%s: " fmt, bt_dev_name(hdev), ##__VA_ARGS__)#define bt_dev_err (hdev, fmt, ...) \ - BT_ERR("%s: " fmt, (hdev)->name, ##__VA_ARGS__) + BT_ERR("%s: " fmt, bt_dev_name(hdev), ##__VA_ARGS__)#define bt_dev_dbg (hdev, fmt, ...) \ - BT_DBG("%s: " fmt, (hdev)->name, ##__VA_ARGS__) + BT_DBG("%s: " fmt, bt_dev_name(hdev), ##__VA_ARGS__)#define bt_dev_warn_ratelimited (hdev, fmt, ...) \ - bt_warn_ratelimited("%s: " fmt, (hdev)->name, ##__VA_ARGS__) + bt_warn_ratelimited("%s: " fmt, bt_dev_name(hdev), ##__VA_ARGS__)#define bt_dev_err_ratelimited (hdev, fmt, ...) \ - bt_err_ratelimited("%s: " fmt, (hdev)->name, ##__VA_ARGS__) + bt_err_ratelimited("%s: " fmt, bt_dev_name(hdev), ##__VA_ARGS__)/* Connection and socket states */ enum {
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 71/98 Bluetooth: use memset avoid memory leaks
In reply to Sasha LevinFrom: "Minghao Chi (CGEL ZTE)" <[email protected]>
[ Upstream commit d3715b2333e9a21692ba16ef8645eda584a9515d ]
Use memset to initialize structs to prevent memory leaks in l2cap_ecred_connect
--- net/bluetooth/l2cap_core.c | 1 + 1 file changed, 1 insertion(+)
net/bluetooth/l2cap_core.c +1 -0
@@ -1436,6 +1436,7 @@ static void l2cap_ecred_connect(struct l2cap_chan *chan)l2cap_ecred_init (chan,0 ); +memset (&data,0 ,sizeof (data)); data.pdu.req.psm = chan->psm; data.pdu.req.mtu =cpu_to_le16 (chan->imtu); data.pdu.req.mps =cpu_to_le16 (chan->mps);
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 72/98 bnxt_en: Eliminate unintended link toggle during FW reset
In reply to Sasha LevinFrom: Michael Chan <[email protected]>
[ Upstream commit 7c492a2530c1f05441da541307c2534230dfd59b ]
If the flow control settings have been changed, a subsequent FW reset may cause the ethernet link to toggle unnecessarily. This link toggle will increase the down time by a few seconds.
The problem is caused by bnxt_update_phy_setting() detecting a false mismatch in the flow control settings between the stored software settings and the current FW settings after the FW reset. This mismatch is caused by the AUTONEG bit added to link_info->req_flow_ctrl in an inconsistent way in bnxt_set_pauseparam() in autoneg mode. The AUTONEG bit should not be added to link_info->req_flow_ctrl.
--- drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-)
drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c +1 -3
@@ -2074,9 +2074,7 @@ static int bnxt_set_pauseparam(struct net_device *dev, } link_info->autoneg |=BNXT_AUTONEG_FLOW_CTRL ; -if (bp->hwrm_spec_code >=0x10201 ) - link_info->req_flow_ctrl = -PORT_PHY_CFG_REQ_AUTO_PAUSE_AUTONEG_PAUSE ; + link_info->req_flow_ctrl =0 ; }else {/* when transition from auto pause to force pause, * force a link change
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 73/98 PCI: endpoint: Fix misused goto label
In reply to Sasha LevinFrom: Li Chen <[email protected]>
[ Upstream commit bf8d87c076f55b8b4dfdb6bc6c6b6dc0c2ccb487 ]
Fix a misused goto label jump since that can result in a memory leak.
--- drivers/pci/endpoint/functions/pci-epf-test.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/pci/endpoint/functions/pci-epf-test.c +1 -1
@@ -451,7 +451,7 @@ static int pci_epf_test_write(struct pci_epf_test *epf_test)if (!epf_test->dma_supported) {dev_err (dev,"Cannot transfer data using DMA\n" ); ret = -EINVAL ; - goto err_map_addr; + goto err_dma_map; } src_phys_addr = dma_map_single(dma_dev, buf, reg->size,
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 74/98 MIPS: fix fortify panic when copying asm exception handlers
In reply to Sasha LevinFrom: Alexander Lobakin <[email protected]>
[ Upstream commit d17b66417308996e7e64b270a3c7f3c1fbd4cfc8 ]
With KCFLAGS="-O3", I was able to trigger a fortify-source memcpy() overflow panic on set_vi_srs_handler(). Although O3 level is not supported in the mainline, under some conditions that may've happened with any optimization settings, it's just a matter of inlining luck. The panic itself is correct, more precisely, 50/50 false-positive and not at the same time. From the one side, no real overflow happens. Exception handler defined in asm just gets copied to some reserved places in the memory.
But the reason behind is that C code refers to that exception handler declares it as char, i.e. something of 1 byte length. It's obvious that the asm function itself is way more than 1 byte, so fortify logics thought we are going to past the symbol declared. The standard way to refer to asm symbols from C code which is not supposed to be called from C is to declare them as extern const u8[]. This is fully correct from any point of view, as any code itself is just a bunch of bytes (including 0 as it is for syms like _stext/_etext/etc.), and the exact size is not known at the moment of compilation.
Adjust the type of the except_vec_vi_*() and related variables. Make set_handler() take const as a second argument to avoid cast-away warnings and give a little more room for optimization.
--- arch/mips/include/asm/setup.h | 2 +- arch/mips/kernel/traps.c | 22 +++++++++++----------- 2 files changed, 12 insertions(+), 12 deletions(-)
arch/mips/include/asm/setup.h +1 -1
@@ -16,7 +16,7 @@ static inline void setup_8250_early_printk_port(unsigned long base, unsigned int reg_shift, unsigned int timeout) {}#endif -extern void set_handler (unsigned long offset,void *addr,unsigned long len); +void set_handler (unsigned long offset,const void *addr,unsigned long len);extern void set_uncached_handler (unsigned long offset,void *addr,unsigned long len);typedef void (*vi_handler_t )(void );
arch/mips/kernel/traps.c +11 -11
@@ -2085,19 +2085,19 @@ static void *set_vi_srs_handler(int n, vi_handler_t addr, int srs)* If no shadow set is selected then use the default handler * that does normal register saving and standard interrupt exit */ -extern char except_vec_vi, except_vec_vi_lui; -extern char except_vec_vi_ori, except_vec_vi_end; -extern char rollback_except_vec_vi; -char *vec_start =using_rollback_handler () ? - &rollback_except_vec_vi : &except_vec_vi; +extern const u8 except_vec_vi[], except_vec_vi_lui[]; +extern const u8 except_vec_vi_ori[], except_vec_vi_end[]; +extern const u8 rollback_except_vec_vi[]; +const u8 *vec_start =using_rollback_handler () ? + rollback_except_vec_vi : except_vec_vi;#if defined(CONFIG_CPU_MICROMIPS ) || defined(CONFIG_CPU_BIG_ENDIAN ) -const int lui_offset = &except_vec_vi_lui - vec_start +2 ; -const int ori_offset = &except_vec_vi_ori - vec_start +2 ; +const int lui_offset = except_vec_vi_lui - vec_start +2 ; +const int ori_offset = except_vec_vi_ori - vec_start +2 ;#else -const int lui_offset = &except_vec_vi_lui - vec_start; -const int ori_offset = &except_vec_vi_ori - vec_start; +const int lui_offset = except_vec_vi_lui - vec_start; +const int ori_offset = except_vec_vi_ori - vec_start;#endif -const int handler_len = &except_vec_vi_end - vec_start; +const int handler_len = except_vec_vi_end - vec_start;if (handler_len >VECTORSPACING ) {/*
@@ -2305,7 +2305,7 @@ void per_cpu_trap_init(bool is_boot_cpu) }/* Install CPU exception handler */ -void set_handler (unsigned long offset,void *addr,unsigned long size) +void set_handler (unsigned long offset,const void *addr,unsigned long size) {#ifdef CONFIG_CPU_MICROMIPS memcpy ((void *)(ebase + offset), ((unsigned char *)addr -1 ), size);
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 75/98 powerpc/code-patching: Pre-map patch area
In reply to Sasha LevinFrom: Michael Ellerman <[email protected]>
[ Upstream commit 591b4b268435f00d2f0b81f786c2c7bd5ef66416 ]
Paul reported a warning with DEBUG_ATOMIC_SLEEP=y:
BUG: sleeping function called from invalid context at include/linux/sched/mm.h:256
in_atomic(): 0, irqs_disabled(): 1, non_block: 0, pid: 1, name: swapper/0
preempt_count: 0, expected: 0
...
Call Trace:
dump_stack_lvl+0xa0/0xec (unreliable)
__might_resched+0x2f4/0x310
kmem_cache_alloc+0x220/0x4b0
__pud_alloc+0x74/0x1d0
hash__map_kernel_page+0x2cc/0x390
do_patch_instruction+0x134/0x4a0
arch_jump_label_transform+0x64/0x78
__jump_label_update+0x148/0x180
static_key_enable_cpuslocked+0xd0/0x120
static_key_enable+0x30/0x50
check_kvm_guest+0x60/0x88
pSeries_smp_probe+0x54/0xb0
smp_prepare_cpus+0x3e0/0x430
kernel_init_freeable+0x20c/0x43c
kernel_init+0x30/0x1a0
ret_from_kernel_thread+0x5c/0x64Peter pointed out that this is because do_patch_instruction() has disabled interrupts, but then map_patch_area() calls map_kernel_page() then hash__map_kernel_page() which does a sleeping memory allocation.
We only see the warning in KVM guests with SMT enabled, which is not particularly common, or on other platforms if CONFIG_KPROBES is disabled, also not common. The reason we don't see it in most configurations is that another path that happens to have interrupts enabled has allocated the required page tables for us, eg. there's a path in kprobes init that does that. That's just pure luck though.
As Christophe suggested, the simplest solution is to do a dummy map/unmap when we initialise the patching, so that any required page table levels are pre-allocated before the first call to do_patch_instruction(). This works because the unmap doesn't free any page tables that were allocated by the map, it just clears the PTE, leaving the page table levels there for the next map.
--- arch/powerpc/lib/code-patching.c | 14 ++++++++++++++ 1 file changed, 14 insertions(+)
arch/powerpc/lib/code-patching.c +14 -0
@@ -47,9 +47,14 @@ int raw_patch_instruction(u32 *addr, struct ppc_inst instr)#ifdef CONFIG_STRICT_KERNEL_RWX static DEFINE_PER_CPU(struct vm_struct *, text_poke_area); +static int map_patch_area (void *addr,unsigned long text_poke_addr); +static void unmap_patch_area (unsigned long addr); +static int text_area_cpu_up (unsigned int cpu) {struct vm_struct *area; +unsigned long addr; +int err; area =get_vm_area (PAGE_SIZE ,VM_ALLOC );if (!area) {
@@ -57,6 +62,15 @@ static int text_area_cpu_up(unsigned int cpu) cpu);return -1 ; } + +// Map/unmap the area to ensure all page tables are pre-allocated + addr = (unsigned long )area->addr; + err =map_patch_area (empty_zero_page, addr); +if (err) +return err; + +unmap_patch_area (addr); +this_cpu_write (text_poke_area, area);return 0 ;
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 76/98 powerpc/64e: Tie PPC_BOOK3E_64 to PPC_FSL_BOOK3E
In reply to Sasha LevinFrom: Michael Ellerman <[email protected]>
[ Upstream commit 1a76e520ee1831a81dabf8a9a58c6453f700026e ]
Since the IBM A2 CPU support was removed, see commit fb5a515704d7 ("powerpc: Remove platforms/wsp and associated pieces"), the only 64-bit Book3E CPUs we support are Freescale (NXP) ones.
However our Kconfig still allows configurating a kernel that has 64-bit Book3E support, but no Freescale CPU support enabled. Such a kernel would never boot, it doesn't know about any CPUs.
It also causes build errors, as reported by lkp, because PPC_BARRIER_NOSPEC is not enabled in such a configuration:
powerpc64-linux-ld: arch/powerpc/net/bpf_jit_comp64.o:(.toc+0x0):
undefined reference to `powerpc_security_features'
To fix this, force PPC_FSL_BOOK3E to be selected whenever we are building a 64-bit Book3E kernel.
--- arch/powerpc/platforms/Kconfig.cputype | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
arch/powerpc/platforms/Kconfig.cputype +2 -1
@@ -111,6 +111,7 @@ config PPC_BOOK3S_64 config PPC_BOOK3E_64 bool "Embedded processors" + select PPC_FSL_BOOK3E select PPC_FPU # Make it a choice ? select PPC_SMP_MUXED_IPI select PPC_DOORBELL
@@ -287,7 +288,7 @@ config FSL_BOOKE config PPC_FSL_BOOK3E bool select ARCH_SUPPORTS_HUGETLBFS if PHYS_64BIT || PPC64 - select FSL_EMB_PERFMON + imply FSL_EMB_PERFMON select PPC_SMP_MUXED_IPI select PPC_DOORBELL default y if FSL_BOOKE
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 77/98 powerpc/secvar: fix refcount leak in format_show()
In reply to Sasha LevinFrom: Hangyu Hua <[email protected]>
[ Upstream commit d601fd24e6964967f115f036a840f4f28488f63f ]
Refcount leak will happen when format_show returns failure in multiple cases. Unified management of of_node_put can fix this problem.
--- arch/powerpc/kernel/secvar-sysfs.c | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
arch/powerpc/kernel/secvar-sysfs.c +6 -3
@@ -26,15 +26,18 @@ static ssize_t format_show(struct kobject *kobj, struct kobj_attribute *attr,const char *format; node =of_find_compatible_node (NULL ,NULL ,"ibm,secvar-backend" ); -if (!of_device_is_available (node)) -return -ENODEV ; +if (!of_device_is_available (node)) { + rc = -ENODEV ; + goto out; + } rc =of_property_read_string (node,"format" , &format);if (rc) -return rc; + goto out; rc =sprintf (buf,"%s\n" , format); +out:of_node_put (node);return rc;
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 78/98 scsi: libfc: Fix use after free in fc_exch_abts_resp()
In reply to Sasha LevinFrom: Jianglei Nie <[email protected]>
[ Upstream commit 271add11994ba1a334859069367e04d2be2ebdd4 ]
fc_exch_release(ep) will decrease the ep's reference count. When the reference count reaches zero, it is freed. But ep is still used in the following code, which will lead to a use after free.
Return after the fc_exch_release() call to avoid use after free.
--- drivers/scsi/libfc/fc_exch.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/libfc/fc_exch.c +1 -0
@@ -1701,6 +1701,7 @@ static void fc_exch_abts_resp(struct fc_exch *ep, struct fc_frame *fp)if (cancel_delayed_work_sync (&ep->timeout_work)) {FC_EXCH_DBG (ep,"Exchange timer canceled due to ABTS response\n" );fc_exch_release (ep);/* release from pending timer hold */ +return ; }spin_lock_bh (&ep->ex_lock);
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 79/98 can: isotp: set default value for N_As to 50 micro seconds
In reply to Sasha LevinFrom: Oliver Hartkopp <[email protected]>
[ Upstream commit 530e0d46c61314c59ecfdb8d3bcb87edbc0f85d3 ]
The N_As value describes the time a CAN frame needs on the wire when transmitted by the CAN controller. Even very short CAN FD frames need arround 100 usecs (bitrate 1Mbit/s, data bitrate 8Mbit/s).
Having N_As to be zero (the former default) leads to 'no CAN frame separation' when STmin is set to zero by the receiving node. This 'burst mode' should not be enabled by default as it could potentially dump a high number of CAN frames into the netdev queue from the soft hrtimer context. This does not affect the system stability but is just not nice and cooperative.
With this N_As/frame_txtime value the 'burst mode' is disabled by default.
As user space applications usually do not set the frame_txtime element of struct can_isotp_options the new in-kernel default is very likely overwritten with zero when the sockopt() CAN_ISOTP_OPTS is invoked. To make sure that a N_As value of zero is only set intentional the value '0' is now interpreted as 'do not change the current value'. When a frame_txtime of zero is required for testing purposes this CAN_ISOTP_FRAME_TXTIME_ZERO u32 value has to be set in frame_txtime.
--- include/uapi/linux/can/isotp.h | 28 ++++++++++++++++++++++------ net/can/isotp.c | 12 +++++++++++- 2 files changed, 33 insertions(+), 7 deletions(-)
include/uapi/linux/can/isotp.h +22 -6
@@ -137,20 +137,16 @@ struct can_isotp_ll_options {#define CAN_ISOTP_WAIT_TX_DONE 0x400/* wait for tx completion */ #define CAN_ISOTP_SF_BROADCAST 0x800/* 1-to-N functional addressing */ -/* default values */ +/* protocol machine default values */ #define CAN_ISOTP_DEFAULT_FLAGS 0#define CAN_ISOTP_DEFAULT_EXT_ADDRESS 0x00#define CAN_ISOTP_DEFAULT_PAD_CONTENT 0xCC/* prevent bit-stuffing */ -#define CAN_ISOTP_DEFAULT_FRAME_TXTIME 0 +#define CAN_ISOTP_DEFAULT_FRAME_TXTIME 50000/* 50 micro seconds */ #define CAN_ISOTP_DEFAULT_RECV_BS 0#define CAN_ISOTP_DEFAULT_RECV_STMIN 0x00#define CAN_ISOTP_DEFAULT_RECV_WFTMAX 0 -#define CAN_ISOTP_DEFAULT_LL_MTU CAN_MTU -#define CAN_ISOTP_DEFAULT_LL_TX_DL CAN_MAX_DLEN -#define CAN_ISOTP_DEFAULT_LL_TX_FLAGS 0 -/* * Remark on CAN_ISOTP_DEFAULT_RECV_* values: *
@@ -162,4 +158,24 @@ struct can_isotp_ll_options {* consistency and copied directly into the flow control (FC) frame. */ +/* link layer default values => make use of Classical CAN frames */ + +#define CAN_ISOTP_DEFAULT_LL_MTU CAN_MTU +#define CAN_ISOTP_DEFAULT_LL_TX_DL CAN_MAX_DLEN +#define CAN_ISOTP_DEFAULT_LL_TX_FLAGS 0 + +/* +* The CAN_ISOTP_DEFAULT_FRAME_TXTIME has become a non-zero value as +* it only makes sense for isotp implementation tests to run without +* a N_As value. As user space applications usually do not set the +* frame_txtime element of struct can_isotp_options the new in-kernel +* default is very likely overwritten with zero when the sockopt() +* CAN_ISOTP_OPTS is invoked. +* To make sure that a N_As value of zero is only set intentional the +* value '0' is now interpreted as 'do not change the current value'. +* When a frame_txtime of zero is required for testing purposes this +* CAN_ISOTP_FRAME_TXTIME_ZERO u32 value has to be set in frame_txtime. +*/ +#define CAN_ISOTP_FRAME_TXTIME_ZERO 0xFFFFFFFF +#endif /* !_UAPI_CAN_ISOTP_H */
net/can/isotp.c +11 -1
@@ -141,6 +141,7 @@ struct isotp_sock {struct can_isotp_options opt;struct can_isotp_fc_options rxfc, txfc;struct can_isotp_ll_options ll; +u32 frame_txtime;u32 force_tx_stmin;u32 force_rx_stmin;struct tpcon rx, tx;
@@ -360,7 +361,7 @@ static int isotp_rcv_fc(struct isotp_sock *so, struct canfd_frame *cf, int ae) so->tx_gap =ktime_set (0 ,0 );/* add transmission time for CAN frame N_As */ - so->tx_gap =ktime_add_ns (so->tx_gap, so->opt.frame_txtime); + so->tx_gap =ktime_add_ns (so->tx_gap, so->frame_txtime);/* add waiting time for consecutive frames N_Cs */ if (so->opt.flags &CAN_ISOTP_FORCE_TXSTMIN ) so->tx_gap = ktime_add_ns(so->tx_gap,
@@ -1238,6 +1239,14 @@ static int isotp_setsockopt_locked(struct socket *sock, int level, int optname,/* no separate rx_ext_address is given => use ext_address */ if (!(so->opt.flags &CAN_ISOTP_RX_EXT_ADDR )) so->opt.rx_ext_address = so->opt.ext_address; + +/* check for frame_txtime changes (0 => no changes) */ +if (so->opt.frame_txtime) { +if (so->opt.frame_txtime ==CAN_ISOTP_FRAME_TXTIME_ZERO ) + so->frame_txtime =0 ; +else + so->frame_txtime = so->opt.frame_txtime; + }break ;case CAN_ISOTP_RECV_FC :
@@ -1439,6 +1448,7 @@ static int isotp_init(struct sock *sk) so->opt.rxpad_content =CAN_ISOTP_DEFAULT_PAD_CONTENT ; so->opt.txpad_content =CAN_ISOTP_DEFAULT_PAD_CONTENT ; so->opt.frame_txtime =CAN_ISOTP_DEFAULT_FRAME_TXTIME ; + so->frame_txtime =CAN_ISOTP_DEFAULT_FRAME_TXTIME ; so->rxfc.bs =CAN_ISOTP_DEFAULT_RECV_BS ; so->rxfc.stmin =CAN_ISOTP_DEFAULT_RECV_STMIN ; so->rxfc.wftmax =CAN_ISOTP_DEFAULT_RECV_WFTMAX ;
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 80/98 can: etas_es58x: es58x_fd_rx_event_msg(): initialize rx_event_msg before calling es58x_check_msg_len()
In reply to Sasha LevinFrom: Vincent Mailhol <[email protected]>
[ Upstream commit 7a8cd7c0ee823a1cc893ab3feaa23e4b602bfb9a ]
Function es58x_fd_rx_event() invokes the es58x_check_msg_len() macro:
| ret = es58x_check_msg_len(es58x_dev->dev, *rx_event_msg, msg_len);
While doing so, it dereferences an uninitialized
variable: *rx_event_msg.
This is actually harmless because es58x_check_msg_len() only uses preprocessor macros (sizeof() and __stringify()) on *rx_event_msg. c.f. [1].
Nonetheless, this pattern is confusing so the lines are reordered to make sure that rx_event_msg is correctly initialized.
This patch also fixes a false positive warning reported by cppcheck:
| cppcheck possible warnings: (new ones prefixed by >>, may not be real problems) | | In file included from drivers/net/can/usb/etas_es58x/es58x_fd.c: | >> drivers/net/can/usb/etas_es58x/es58x_fd.c:174:8: warning: Uninitialized variable: rx_event_msg [uninitvar] | ret = es58x_check_msg_len(es58x_dev->dev, *rx_event_msg, msg_len); | ^
[1] https://elixir.bootlin.com/linux/v5.16/source/drivers/net/can/usb/etas_es58x/es58x_core.h#L467
--- drivers/net/can/usb/etas_es58x/es58x_fd.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/net/can/usb/etas_es58x/es58x_fd.c +1 -2
@@ -171,12 +171,11 @@ static int es58x_fd_rx_event_msg(struct net_device *netdev,const struct es58x_fd_rx_event_msg *rx_event_msg;int ret; + rx_event_msg = &es58x_fd_urb_cmd->rx_event_msg; ret =es58x_check_msg_len (es58x_dev->dev, *rx_event_msg, msg_len);if (ret)return ret; - rx_event_msg = &es58x_fd_urb_cmd->rx_event_msg; -return es58x_rx_err_msg (netdev, rx_event_msg->error_code, rx_event_msg->event_code,get_unaligned_le64 (&rx_event_msg->timestamp));
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 81/98 riscv: Fixed misaligned memory access. Fixed pointer comparison.
In reply to Sasha LevinFrom: "Michael T. Kloos" <[email protected]>
[ Upstream commit 9d1f0ec9f71780e69ceb9d91697600c747d6e02e ]
Rewrote the RISC-V memmove() assembly implementation. The previous implementation did not check memory alignment and it compared 2 pointers with a signed comparison. The misaligned memory access would cause the kernel to crash on systems that did not emulate it in firmware and did not support it in hardware. Firmware emulation is slow and may not exist. The RISC-V spec does not guarantee that support for misaligned memory accesses will exist. It should not be depended on.
This patch now checks for XLEN granularity of co-alignment between the pointers. Failing that, copying is done by loading from the 2 contiguous and naturally aligned XLEN memory locations containing the overlapping XLEN sized data to be copied. The data is shifted into the correct place and binary or'ed together on each iteration. The result is then stored into the corresponding naturally aligned XLEN sized location in the destination. For unaligned data at the terminations of the regions to be copied or for copies less than (2 * XLEN) in size, byte copy is used.
This patch also now uses unsigned comparison for the pointers and migrates to the newer assembler annotations from the now deprecated ones.
--- arch/riscv/lib/memmove.S | 368 +++++++++++++++++++++++++++++++++------ 1 file changed, 310 insertions(+), 58 deletions(-)
arch/riscv/lib/memmove.S +310 -58
@@ -1,64 +1,316 @@ -/* SPDX-License-Identifier: GPL-2.0 */ +/* SPDX-License-Identifier: GPL-2.0-only */ +/* + * Copyright (C) 2022 Michael T. Kloos <[email protected]> + */ #include <linux/linkage.h> #include <asm/asm.h> -ENTRY(__memmove) -WEAK(memmove) - move t0, a0 - move t1, a1 - - beq a0, a1, exit_memcpy - beqz a2, exit_memcpy - srli t2, a2, 0x2 - - slt t3, a0, a1 - beqz t3, do_reverse - - andi a2, a2, 0x3 - li t4, 1 - beqz t2, byte_copy - -word_copy: - lw t3, 0(a1) - addi t2, t2, -1 - addi a1, a1, 4 - sw t3, 0(a0) - addi a0, a0, 4 - bnez t2, word_copy - beqz a2, exit_memcpy - j byte_copy - -do_reverse: - add a0, a0, a2 - add a1, a1, a2 - andi a2, a2, 0x3 - li t4, -1 - beqz t2, reverse_byte_copy - -reverse_word_copy: - addi a1, a1, -4 - addi t2, t2, -1 - lw t3, 0(a1) - addi a0, a0, -4 - sw t3, 0(a0) - bnez t2, reverse_word_copy - beqz a2, exit_memcpy - -reverse_byte_copy: - addi a0, a0, -1 - addi a1, a1, -1 +SYM_FUNC_START(__memmove) +SYM_FUNC_START_WEAK(memmove) + /* + * Returns + * a0 - dest + * + * Parameters + * a0 - Inclusive first byte of dest + * a1 - Inclusive first byte of src + * a2 - Length of copy n + * + * Because the return matches the parameter register a0, + * we will not clobber or modify that register. + * + * Note: This currently only works on little-endian. + * To port to big-endian, reverse the direction of shifts + * in the 2 misaligned fixup copy loops. + */ + /* Return if nothing to do */ + beq a0, a1, return_from_memmove + beqz a2, return_from_memmove + + /* + * Register Uses + * Forward Copy: a1 - Index counter of src + * Reverse Copy: a4 - Index counter of src + * Forward Copy: t3 - Index counter of dest + * Reverse Copy: t4 - Index counter of dest + * Both Copy Modes: t5 - Inclusive first multibyte/aligned of dest + * Both Copy Modes: t6 - Non-Inclusive last multibyte/aligned of dest + * Both Copy Modes: t0 - Link / Temporary for load-store + * Both Copy Modes: t1 - Temporary for load-store + * Both Copy Modes: t2 - Temporary for load-store + * Both Copy Modes: a5 - dest to src alignment offset + * Both Copy Modes: a6 - Shift ammount + * Both Copy Modes: a7 - Inverse Shift ammount + * Both Copy Modes: a2 - Alternate breakpoint for unrolled loops + */ + + /* + * Solve for some register values now. + * Byte copy does not need t5 or t6. + */ + mv t3, a0 + add t4, a0, a2 + add a4, a1, a2 + + /* + * Byte copy if copying less than (2 * SZREG) bytes. This can + * cause problems with the bulk copy implementation and is + * small enough not to bother. + */ + andi t0, a2, -(2 * SZREG) + beqz t0, byte_copy + + /* + * Now solve for t5 and t6. + */ + andi t5, t3, -SZREG + andi t6, t4, -SZREG + /* + * If dest(Register t3) rounded down to the nearest naturally + * aligned SZREG address, does not equal dest, then add SZREG + * to find the low-bound of SZREG alignment in the dest memory + * region. Note that this could overshoot the dest memory + * region if n is less than SZREG. This is one reason why + * we always byte copy if n is less than SZREG. + * Otherwise, dest is already naturally aligned to SZREG. + */ + beq t5, t3, 1f + addi t5, t5, SZREG + 1: + + /* + * If the dest and src are co-aligned to SZREG, then there is + * no need for the full rigmarole of a full misaligned fixup copy. + * Instead, do a simpler co-aligned copy. + */ + xor t0, a0, a1 + andi t1, t0, (SZREG - 1) + beqz t1, coaligned_copy + /* Fall through to misaligned fixup copy */ + +misaligned_fixup_copy: + bltu a1, a0, misaligned_fixup_copy_reverse + +misaligned_fixup_copy_forward: + jal t0, byte_copy_until_aligned_forward + + andi a5, a1, (SZREG - 1) /* Find the alignment offset of src (a1) */ + slli a6, a5, 3 /* Multiply by 8 to convert that to bits to shift */ + sub a5, a1, t3 /* Find the difference between src and dest */ + andi a1, a1, -SZREG /* Align the src pointer */ + addi a2, t6, SZREG /* The other breakpoint for the unrolled loop*/ + + /* + * Compute The Inverse Shift + * a7 = XLEN - a6 = XLEN + -a6 + * 2s complement negation to find the negative: -a6 = ~a6 + 1 + * Add that to XLEN. XLEN = SZREG * 8. + */ + not a7, a6 + addi a7, a7, (SZREG * 8 + 1) + + /* + * Fix Misalignment Copy Loop - Forward + * load_val0 = load_ptr[0]; + * do { + * load_val1 = load_ptr[1]; + * store_ptr += 2; + * store_ptr[0 - 2] = (load_val0 >> {a6}) | (load_val1 << {a7}); + * + * if (store_ptr == {a2}) + * break; + * + * load_val0 = load_ptr[2]; + * load_ptr += 2; + * store_ptr[1 - 2] = (load_val1 >> {a6}) | (load_val0 << {a7}); + * + * } while (store_ptr != store_ptr_end); + * store_ptr = store_ptr_end; + */ + + REG_L t0, (0 * SZREG)(a1) + 1: + REG_L t1, (1 * SZREG)(a1) + addi t3, t3, (2 * SZREG) + srl t0, t0, a6 + sll t2, t1, a7 + or t2, t0, t2 + REG_S t2, ((0 * SZREG) - (2 * SZREG))(t3) + + beq t3, a2, 2f + + REG_L t0, (2 * SZREG)(a1) + addi a1, a1, (2 * SZREG) + srl t1, t1, a6 + sll t2, t0, a7 + or t2, t1, t2 + REG_S t2, ((1 * SZREG) - (2 * SZREG))(t3) + + bne t3, t6, 1b + 2: + mv t3, t6 /* Fix the dest pointer in case the loop was broken */ + + add a1, t3, a5 /* Restore the src pointer */ + j byte_copy_forward /* Copy any remaining bytes */ + +misaligned_fixup_copy_reverse: + jal t0, byte_copy_until_aligned_reverse + + andi a5, a4, (SZREG - 1) /* Find the alignment offset of src (a4) */ + slli a6, a5, 3 /* Multiply by 8 to convert that to bits to shift */ + sub a5, a4, t4 /* Find the difference between src and dest */ + andi a4, a4, -SZREG /* Align the src pointer */ + addi a2, t5, -SZREG /* The other breakpoint for the unrolled loop*/ + + /* + * Compute The Inverse Shift + * a7 = XLEN - a6 = XLEN + -a6 + * 2s complement negation to find the negative: -a6 = ~a6 + 1 + * Add that to XLEN. XLEN = SZREG * 8. + */ + not a7, a6 + addi a7, a7, (SZREG * 8 + 1) + + /* + * Fix Misalignment Copy Loop - Reverse + * load_val1 = load_ptr[0]; + * do { + * load_val0 = load_ptr[-1]; + * store_ptr -= 2; + * store_ptr[1] = (load_val0 >> {a6}) | (load_val1 << {a7}); + * + * if (store_ptr == {a2}) + * break; + * + * load_val1 = load_ptr[-2]; + * load_ptr -= 2; + * store_ptr[0] = (load_val1 >> {a6}) | (load_val0 << {a7}); + * + * } while (store_ptr != store_ptr_end); + * store_ptr = store_ptr_end; + */ + + REG_L t1, ( 0 * SZREG)(a4) + 1: + REG_L t0, (-1 * SZREG)(a4) + addi t4, t4, (-2 * SZREG) + sll t1, t1, a7 + srl t2, t0, a6 + or t2, t1, t2 + REG_S t2, ( 1 * SZREG)(t4) + + beq t4, a2, 2f + + REG_L t1, (-2 * SZREG)(a4) + addi a4, a4, (-2 * SZREG) + sll t0, t0, a7 + srl t2, t1, a6 + or t2, t0, t2 + REG_S t2, ( 0 * SZREG)(t4) + + bne t4, t5, 1b + 2: + mv t4, t5 /* Fix the dest pointer in case the loop was broken */ + + add a4, t4, a5 /* Restore the src pointer */ + j byte_copy_reverse /* Copy any remaining bytes */ + +/* + * Simple copy loops for SZREG co-aligned memory locations. + * These also make calls to do byte copies for any unaligned + * data at their terminations. + */ +coaligned_copy: + bltu a1, a0, coaligned_copy_reverse + +coaligned_copy_forward: + jal t0, byte_copy_until_aligned_forward + + 1: + REG_L t1, ( 0 * SZREG)(a1) + addi a1, a1, SZREG + addi t3, t3, SZREG + REG_S t1, (-1 * SZREG)(t3) + bne t3, t6, 1b + + j byte_copy_forward /* Copy any remaining bytes */ + +coaligned_copy_reverse: + jal t0, byte_copy_until_aligned_reverse + + 1: + REG_L t1, (-1 * SZREG)(a4) + addi a4, a4, -SZREG + addi t4, t4, -SZREG + REG_S t1, ( 0 * SZREG)(t4) + bne t4, t5, 1b + + j byte_copy_reverse /* Copy any remaining bytes */ + +/* + * These are basically sub-functions within the function. They + * are used to byte copy until the dest pointer is in alignment. + * At which point, a bulk copy method can be used by the + * calling code. These work on the same registers as the bulk + * copy loops. Therefore, the register values can be picked + * up from where they were left and we avoid code duplication + * without any overhead except the call in and return jumps. + */ +byte_copy_until_aligned_forward: + beq t3, t5, 2f + 1: + lb t1, 0(a1) + addi a1, a1, 1 + addi t3, t3, 1 + sb t1, -1(t3) + bne t3, t5, 1b + 2: + jalr zero, 0x0(t0) /* Return to multibyte copy loop */ + +byte_copy_until_aligned_reverse: + beq t4, t6, 2f + 1: + lb t1, -1(a4) + addi a4, a4, -1 + addi t4, t4, -1 + sb t1, 0(t4) + bne t4, t6, 1b + 2: + jalr zero, 0x0(t0) /* Return to multibyte copy loop */ + +/* + * Simple byte copy loops. + * These will byte copy until they reach the end of data to copy. + * At that point, they will call to return from memmove. + */ byte_copy: - lb t3, 0(a1) - addi a2, a2, -1 - sb t3, 0(a0) - add a1, a1, t4 - add a0, a0, t4 - bnez a2, byte_copy - -exit_memcpy: - move a0, t0 - move a1, t1 - ret -END(__memmove) + bltu a1, a0, byte_copy_reverse + +byte_copy_forward: + beq t3, t4, 2f + 1: + lb t1, 0(a1) + addi a1, a1, 1 + addi t3, t3, 1 + sb t1, -1(t3) + bne t3, t4, 1b + 2: + ret + +byte_copy_reverse: + beq t4, t3, 2f + 1: + lb t1, -1(a4) + addi a4, a4, -1 + addi t4, t4, -1 + sb t1, 0(t4) + bne t4, t3, 1b + 2: + +return_from_memmove: + ret + +SYM_FUNC_END(memmove) +SYM_FUNC_END(__memmove)
Signature · 7 lines
2.34.1 _______________________________________________ linux-riscv mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-riscv
Sasha Levin
maintainerPATCH 82/98 net: account alternate interface name memory
In reply to Sasha LevinFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 5d26cff5bdbebdf98ba48217c078ff102536f134 ]
George reports that altnames can eat up kernel memory. We should charge that memory appropriately.
--- net/core/rtnetlink.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
net/core/rtnetlink.c +1 -1
@@ -3637,7 +3637,7 @@ static int rtnl_alt_ifname(int cmd, struct net_device *dev, struct nlattr *attr,if (err)return err; - alt_ifname =nla_strdup (attr,GFP_KERNEL ); + alt_ifname =nla_strdup (attr,GFP_KERNEL_ACCOUNT );if (!alt_ifname)return -ENOMEM ;
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 83/98 net: limit altnames to 64k total
In reply to Sasha LevinFrom: Jakub Kicinski <[email protected]>
[ Upstream commit 155fb43b70b5fce341347a77d1af2765d1e8fbb8 ]
Property list (altname is a link "property") is wrapped in a nlattr. nlattrs length is 16bit so practically speaking the list of properties can't be longer than that, otherwise user space would have to interpret broken netlink messages.
Prevent the problem from occurring by checking the length of the property list before adding new entries.
--- net/core/rtnetlink.c | 11 +++++++++++ 1 file changed, 11 insertions(+)
net/core/rtnetlink.c +11 -0
@@ -3631,12 +3631,23 @@ static int rtnl_alt_ifname(int cmd, struct net_device *dev, struct nlattr *attr, bool *changed, struct netlink_ext_ack *extack) { char *alt_ifname; +size_t size;int err; err =nla_validate (attr, attr->nla_len,IFLA_MAX , ifla_policy, extack);if (err)return err; +if (cmd ==RTM_NEWLINKPROP ) { + size =rtnl_prop_list_size (dev); + size +=nla_total_size (ALTIFNAMSIZ ); +if (size >=U16_MAX ) { +NL_SET_ERR_MSG (extack, +"effective property list too long" ); +return -EINVAL ; + } + } + alt_ifname =nla_strdup (attr,GFP_KERNEL_ACCOUNT );if (!alt_ifname)return -ENOMEM ;
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 84/98 net/mlx5e: Remove overzealous validations in netlink EEPROM query
In reply to Sasha LevinFrom: Gal Pressman <[email protected]>
[ Upstream commit 970adfb76095fa719778d70a6b86030d2feb88dd ]
Unlike the legacy EEPROM callbacks, when using the netlink EEPROM query (get_module_eeprom_by_page) the driver should not try to validate the query parameters, but just perform the read requested by the userspace.
Recent discussion in the mailing list:
https://lore.kernel.org/netdev/20220120093051.70845141@kicinski-fedora-PC1C0HJN.hsd1.ca.comcast.net/
--- .../net/ethernet/mellanox/mlx5/core/port.c | 23 ------------------- 1 file changed, 23 deletions(-)
drivers/net/ethernet/mellanox/mlx5/core/port.c +0 -23
@@ -433,35 +433,12 @@ int mlx5_query_module_eeprom_by_page(struct mlx5_core_dev *dev,struct mlx5_module_eeprom_query_params *params, u8 *data) { - u8 module_id; int err; err =mlx5_query_module_num (dev, ¶ms->module_number);if (err)return err; - err =mlx5_query_module_id (dev, params->module_number, &module_id); -if (err) -return err; - -switch (module_id) { -case MLX5_MODULE_ID_SFP : -if (params->page >0 ) -return -EINVAL ; -break ; -case MLX5_MODULE_ID_QSFP : -case MLX5_MODULE_ID_QSFP28 : -case MLX5_MODULE_ID_QSFP_PLUS : -if (params->page >3 ) -return -EINVAL ; -break ; -case MLX5_MODULE_ID_DSFP : -break ; -default : -mlx5_core_err (dev,"Module ID not recognized: 0x%x\n" , module_id); -return -EINVAL ; - } -if (params->i2c_address !=MLX5_I2C_ADDR_HIGH && params->i2c_address !=MLX5_I2C_ADDR_LOW ) {mlx5_core_err (dev,"I2C address not recognized: 0x%x\n" , params->i2c_address);
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 85/98 platform/x86: hp-wmi: Fix SW_TABLET_MODE detection method
In reply to Sasha LevinFrom: Jorge Lopez <[email protected]>
[ Upstream commit 520ee4ea1cc60251a6e3c911cf0336278aa52634 ]
The purpose of this patch is to introduce a fix and removal of the current hack when determining tablet mode status.
Determining the tablet mode status requires reading Byte 0 bit 2 as reported by HPWMI_HARDWARE_QUERY. The investigation identified the failure was rooted in two areas: HPWMI_HARDWARE_QUERY failure (0x05) and reading Byte 0, bit 2 only to determine the table mode status. HPWMI_HARDWARE_QUERY WMI failure also rendered the dock state value invalid.
The latest changes use SMBIOS Type 3 (chassis type) and WMI Command 0x40 (device_mode_status) information to determine if the device is in tablet mode or not.
hp_wmi_hw_state function was split into two functions; hp_wmi_get_dock_state and hp_wmi_get_tablet_mode. The new functions separate how dock_state and tablet_mode is handled in a cleaner manner.
All changes were validated on a HP ZBook Workstation notebook, HP EliteBook x360, and HP EliteBook 850 G8.
--- drivers/platform/x86/hp-wmi.c | 71 +++++++++++++++++++++++++---------- 1 file changed, 52 insertions(+), 19 deletions(-)
drivers/platform/x86/hp-wmi.c +52 -19
@@ -33,10 +33,6 @@ MODULE_LICENSE("GPL");MODULE_ALIAS ("wmi:95F24279-4D7B-4334-9387-ACCDC67EF61C" );MODULE_ALIAS ("wmi:5FB7F034-2C63-45e9-BE91-3D44E2C707E4" ); -static int enable_tablet_mode_sw =-1 ; -module_param (enable_tablet_mode_sw, int,0444 ); -MODULE_PARM_DESC (enable_tablet_mode_sw,"Enable SW_TABLET_MODE reporting (-1=auto, 0=no, 1=yes)" ); -#define HPWMI_EVENT_GUID "95F24279-4D7B-4334-9387-ACCDC67EF61C"#define HPWMI_BIOS_GUID "5FB7F034-2C63-45e9-BE91-3D44E2C707E4"
@@ -86,6 +82,7 @@ enum hp_wmi_commandtype {HPWMI_FEATURE2_QUERY =0x0d ,HPWMI_WIRELESS2_QUERY =0x1b ,HPWMI_POSTCODEERROR_QUERY =0x2a , +HPWMI_SYSTEM_DEVICE_MODE =0x40 , HPWMI_THERMAL_PROFILE_QUERY = 0x4c, };
@@ -182,6 +179,19 @@ struct rfkill2_device {static int rfkill2_count;static struct rfkill2_device rfkill2[HPWMI_MAX_RFKILL2_DEVICES ]; +/* +* Chassis Types values were obtained from SMBIOS reference +* specification version 3.00. A complete list of system enclosures +* and chassis types is available on Table 17. +*/ +static const char *const tablet_chassis_types[] = { +"30" ,/* Tablet*/ +"31" ,/* Convertible */ +"32" /* Detachable */ +}; + +#define DEVICE_MODE_TABLET 0x06 +/* map output size to the corresponding WMI method id */ static inline int encode_outsize_for_pvsz (int outsize) {
@@ -292,14 +302,39 @@ static int hp_wmi_read_int(int query)return val; } -static int hp_wmi_hw_state (int mask) +static int hp_wmi_get_dock_state (void ) {int state =hp_wmi_read_int (HPWMI_HARDWARE_QUERY );if (state <0 )return state; -return !!(state & mask); +return !!(state &HPWMI_DOCK_MASK ); +} + +static int hp_wmi_get_tablet_mode (void ) +{ +char system_device_mode[4 ] = {0 }; +const char *chassis_type; +bool tablet_found; +int ret; + + chassis_type =dmi_get_system_info (DMI_CHASSIS_TYPE ); +if (!chassis_type) +return -ENODEV ; + + tablet_found =match_string (tablet_chassis_types, +ARRAY_SIZE (tablet_chassis_types), + chassis_type) >=0 ; +if (!tablet_found) +return -ENODEV ; + + ret =hp_wmi_perform_query (HPWMI_SYSTEM_DEVICE_MODE ,HPWMI_READ , + system_device_mode,0 ,sizeof (system_device_mode)); +if (ret <0 ) +return ret; + +return system_device_mode[0 ] ==DEVICE_MODE_TABLET ; }static int __init hp_wmi_bios_2008_later (void )
@@ -448,7 +483,7 @@ static ssize_t als_show(struct device *dev, struct device_attribute *attr,static ssize_t dock_show (struct device *dev,struct device_attribute *attr,char *buf) { -int value =hp_wmi_hw_state (HPWMI_DOCK_MASK ); +int value =hp_wmi_get_dock_state ();if (value <0 )return value;return sprintf (buf,"%d\n" , value);
@@ -457,7 +492,7 @@ static ssize_t dock_show(struct device *dev, struct device_attribute *attr,static ssize_t tablet_show (struct device *dev,struct device_attribute *attr,char *buf) { -int value =hp_wmi_hw_state (HPWMI_TABLET_MASK ); +int value =hp_wmi_get_tablet_mode ();if (value <0 )return value;return sprintf (buf,"%d\n" , value);
@@ -579,10 +614,10 @@ static void hp_wmi_notify(u32 value, void *context)case HPWMI_DOCK_EVENT :if (test_bit (SW_DOCK , hp_wmi_input_dev->swbit))input_report_switch (hp_wmi_input_dev,SW_DOCK , -hp_wmi_hw_state (HPWMI_DOCK_MASK )); +hp_wmi_get_dock_state ());if (test_bit (SW_TABLET_MODE , hp_wmi_input_dev->swbit))input_report_switch (hp_wmi_input_dev,SW_TABLET_MODE , -hp_wmi_hw_state (HPWMI_TABLET_MASK )); +hp_wmi_get_tablet_mode ());input_sync (hp_wmi_input_dev);break ;case HPWMI_PARK_HDD :
@@ -660,19 +695,17 @@ static int __init hp_wmi_input_setup(void)__set_bit (EV_SW , hp_wmi_input_dev->evbit);/* Dock */ - val =hp_wmi_hw_state (HPWMI_DOCK_MASK ); + val =hp_wmi_get_dock_state ();if (!(val <0 )) {__set_bit (SW_DOCK , hp_wmi_input_dev->swbit);input_report_switch (hp_wmi_input_dev,SW_DOCK , val); }/* Tablet mode */ -if (enable_tablet_mode_sw >0 ) { - val =hp_wmi_hw_state (HPWMI_TABLET_MASK ); -if (val >=0 ) { -__set_bit (SW_TABLET_MODE , hp_wmi_input_dev->swbit); -input_report_switch (hp_wmi_input_dev,SW_TABLET_MODE , val); - } + val =hp_wmi_get_tablet_mode (); +if (!(val <0 )) { +__set_bit (SW_TABLET_MODE , hp_wmi_input_dev->swbit); +input_report_switch (hp_wmi_input_dev,SW_TABLET_MODE , val); } err =sparse_keymap_setup (hp_wmi_input_dev, hp_wmi_keymap,NULL );
@@ -1028,10 +1061,10 @@ static int hp_wmi_resume_handler(struct device *device)if (hp_wmi_input_dev) {if (test_bit (SW_DOCK , hp_wmi_input_dev->swbit))input_report_switch (hp_wmi_input_dev,SW_DOCK , -hp_wmi_hw_state (HPWMI_DOCK_MASK )); +hp_wmi_get_dock_state ());if (test_bit (SW_TABLET_MODE , hp_wmi_input_dev->swbit))input_report_switch (hp_wmi_input_dev,SW_TABLET_MODE , -hp_wmi_hw_state (HPWMI_TABLET_MASK )); +hp_wmi_get_tablet_mode ());input_sync (hp_wmi_input_dev); }
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 86/98 net: sfp: add 2500base-X quirk for Lantech SFP module
In reply to Sasha LevinFrom: Michael Walle <[email protected]>
[ Upstream commit 00eec9fe4f3b9588b4bfa8ef9dd0aae96407d5d7 ]
The Lantech 8330-262D-E module is 2500base-X capable, but it reports the nominal bitrate as 2500MBd instead of 3125MBd. Add a quirk for the module.
The following in an EEPROM dump of such a SFP with the serial number redacted:
00: 03 04 07 00 00 00 01 20 40 0c 05 01 19 00 00 00 ???...? @????...
10: 1e 0f 00 00 4c 61 6e 74 65 63 68 20 20 20 20 20 ??..Lantech
20: 20 20 20 20 00 00 00 00 38 33 33 30 2d 32 36 32 ....8330-262
30: 44 2d 45 20 20 20 20 20 56 31 2e 30 03 52 00 cb D-E V1.0?R.?
40: 00 1a 00 00 46 43 XX XX XX XX XX XX XX XX XX XX .?..FCXXXXXXXXXX
50: 20 20 20 20 32 32 30 32 31 34 20 20 68 b0 01 98 220214 h???
60: 45 58 54 52 45 4d 45 4c 59 20 43 4f 4d 50 41 54 EXTREMELY COMPAT
70: 49 42 4c 45 20 20 20 20 20 20 20 20 20 20 20 20 IBLE
--- drivers/net/phy/sfp-bus.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/phy/sfp-bus.c +6 -0
@@ -74,6 +74,12 @@ static const struct sfp_quirk sfp_quirks[] = { .vendor = "HUAWEI", .part = "MA5671A", .modes = sfp_quirk_2500basex, + }, { +// Lantech 8330-262D-E can operate at 2500base-X, but +// incorrectly report 2500MBd NRZ in their EEPROM + .vendor = "Lantech", + .part = "8330-262D-E", + .modes = sfp_quirk_2500basex, }, { .vendor = "UBNT", .part = "UF-INSTANT",
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 87/98 usb: dwc3: omap: fix "unbalanced disables for smps10_out1" on omap5evm
In reply to Sasha LevinFrom: "H. Nikolaus Schaller" <[email protected]>
[ Upstream commit ac01df343e5a6c6bcead2ed421af1fde30f73e7e ]
Usually, the vbus_regulator (smps10 on omap5evm) boots up disabled.
Hence calling regulator_disable() indirectly through dwc3_omap_set_mailbox() during probe leads to:
[ 10.332764] WARNING: CPU: 0 PID: 1628 at drivers/regulator/core.c:2853 _regulator_disable+0x40/0x164 [ 10.351919] unbalanced disables for smps10_out1 [ 10.361298] Modules linked in: dwc3_omap(+) clk_twl6040 at24 gpio_twl6040 palmas_gpadc palmas_pwrbutton industrialio snd_soc_omap_mcbsp(+) snd_soc_ti_sdma display_connector ti_tpd12s015 drm leds_gpio drm_panel_orientation_quirks ip_tables x_tables ipv6 autofs4 [ 10.387818] CPU: 0 PID: 1628 Comm: systemd-udevd Not tainted 5.17.0-rc1-letux-lpae+ #8139 [ 10.405129] Hardware name: Generic OMAP5 (Flattened Device Tree) [ 10.411455] unwind_backtrace from show_stack+0x10/0x14 [ 10.416970] show_stack from dump_stack_lvl+0x40/0x4c [ 10.422313] dump_stack_lvl from __warn+0xb8/0x170 [ 10.427377] __warn from warn_slowpath_fmt+0x70/0x9c [ 10.432595] warn_slowpath_fmt from _regulator_disable+0x40/0x164 [ 10.439037] _regulator_disable from regulator_disable+0x30/0x64 [ 10.445382] regulator_disable from dwc3_omap_set_mailbox+0x8c/0xf0 [dwc3_omap] [ 10.453116] dwc3_omap_set_mailbox [dwc3_omap] from dwc3_omap_probe+0x2b8/0x394 [dwc3_omap] [ 10.467021] dwc3_omap_probe [dwc3_omap] from platform_probe+0x58/0xa8 [ 10.481762] platform_probe from really_probe+0x168/0x2fc [ 10.481782] really_probe from __driver_probe_device+0xc4/0xd8 [ 10.481782] __driver_probe_device from driver_probe_device+0x24/0xa4 [ 10.503762] driver_probe_device from __driver_attach+0xc4/0xd8 [ 10.510018] __driver_attach from bus_for_each_dev+0x64/0xa0 [ 10.516001] bus_for_each_dev from bus_add_driver+0x148/0x1a4 [ 10.524880] bus_add_driver from driver_register+0xb4/0xf8 [ 10.530678] driver_register from do_one_initcall+0x90/0x1c4 [ 10.536661] do_one_initcall from do_init_module+0x4c/0x200 [ 10.536683] do_init_module from load_module+0x13dc/0x1910 [ 10.551159] load_module from sys_finit_module+0xc8/0xd8 [ 10.561319] sys_finit_module from __sys_trace_return+0x0/0x18 [ 10.561336] Exception stack(0xc344bfa8 to 0xc344bff0) [ 10.561341] bfa0: b6fb5778 b6fab8d8 00000007 b6ecfbb8 00000000 b6ed0398 [ 10.561341] bfc0: b6fb5778 b6fab8d8 855c0500 0000017b 00020000 b6f9a3cc 00000000 b6fb5778 [ 10.595500] bfe0: bede18f8 bede18e8 b6ec9aeb b6dda1c2 [ 10.601345] ---[ end trace 0000000000000000 ]---
Fix this unnecessary warning by checking if the regulator is enabled.
--- drivers/usb/dwc3/dwc3-omap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/dwc3/dwc3-omap.c +1 -1
@@ -242,7 +242,7 @@ static void dwc3_omap_set_mailbox(struct dwc3_omap *omap,break ;case OMAP_DWC3_ID_FLOAT : -if (omap->vbus_reg) +if (omap->vbus_reg &®ulator_is_enabled (omap->vbus_reg))regulator_disable (omap->vbus_reg); val =dwc3_omap_read_utmi_ctrl (omap); val |=USBOTGSS_UTMI_OTG_CTRL_IDDIG ;
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 88/98 mt76: fix monitor mode crash with sdio driver
In reply to Sasha LevinFrom: Deren Wu <[email protected]>
[ Upstream commit 123bc712b1de0805f9d683687e17b1ec2aba0b68 ]
mt7921s driver may receive frames with fragment buffers. If there is a CTS packet received in monitor mode, the payload is 10 bytes only and need 6 bytes header padding after RXD buffer. However, only RXD in the first linear buffer, if we pull buffer size RXD-size+6 bytes with skb_pull(), that would trigger "BUG_ON(skb->len < skb->data_len)" in __skb_pull().
To avoid the nonlinear buffer issue, enlarge the RXD size from 128 to 256 to make sure all MCU operation in linear buffer.
[ 52.007562] kernel BUG at include/linux/skbuff.h:2313! [ 52.007578] Internal error: Oops - BUG: 0 [#1] PREEMPT SMP [ 52.007987] pc : skb_pull+0x48/0x4c [ 52.008015] lr : mt7921_queue_rx_skb+0x494/0x890 [mt7921_common] [ 52.008361] Call trace: [ 52.008377] skb_pull+0x48/0x4c [ 52.008400] mt76s_net_worker+0x134/0x1b0 [mt76_sdio 35339a92c6eb7d4bbcc806a1d22f56365565135c] [ 52.008431] __mt76_worker_fn+0xe8/0x170 [mt76 ef716597d11a77150bc07e3fdd68eeb0f9b56917] [ 52.008449] kthread+0x148/0x3ac [ 52.008466] ret_from_fork+0x10/0x30
--- drivers/net/wireless/mediatek/mt76/mt76.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/wireless/mediatek/mt76/mt76.h +1 -1
@@ -19,7 +19,7 @@#define MT_MCU_RING_SIZE 32#define MT_RX_BUF_SIZE 2048 -#define MT_SKB_HEAD_LEN 128 +#define MT_SKB_HEAD_LEN 256#define MT_MAX_NON_AQL_PKT 16#define MT_TXQ_FREE_THR 32
Signature · 7 lines
2.34.1 _______________________________________________ Linux-mediatek mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-mediatek
Sasha Levin
maintainerPATCH 89/98 xtensa: fix DTC warning unit_address_format
In reply to Sasha LevinFrom: Max Filippov <[email protected]>
[ Upstream commit e85d29ba4b24f68e7a78cb85c55e754362eeb2de ]
DTC issues the following warnings when building xtfpga device trees:
/soc/flash@00000000/partition@0x0: unit name should not have leading "0x" /soc/flash@00000000/partition@0x6000000: unit name should not have leading "0x" /soc/flash@00000000/partition@0x6800000: unit name should not have leading "0x" /soc/flash@00000000/partition@0x7fe0000: unit name should not have leading "0x"
Drop leading 0x from flash partition unit names.
--- arch/xtensa/boot/dts/xtfpga-flash-128m.dtsi | 8 ++++---- arch/xtensa/boot/dts/xtfpga-flash-16m.dtsi | 8 ++++---- arch/xtensa/boot/dts/xtfpga-flash-4m.dtsi | 4 ++-- 3 files changed, 10 insertions(+), 10 deletions(-)
arch/xtensa/boot/dts/xtfpga-flash-128m.dtsi +4 -4
@@ -8,19 +8,19 @@ flash: flash@00000000 { reg = <0x00000000 0x08000000>; bank-width = <2>; device-width = <2>; - partition@0x0 { + partition@0 { label = "data"; reg = <0x00000000 0x06000000>; }; - partition@0x6000000 { + partition@6000000 { label = "boot loader area"; reg = <0x06000000 0x00800000>; }; - partition@0x6800000 { + partition@6800000 { label = "kernel image"; reg = <0x06800000 0x017e0000>; }; - partition@0x7fe0000 { + partition@7fe0000 { label = "boot environment"; reg = <0x07fe0000 0x00020000>; };
arch/xtensa/boot/dts/xtfpga-flash-16m.dtsi +4 -4
@@ -8,19 +8,19 @@ flash: flash@08000000 { reg = <0x08000000 0x01000000>; bank-width = <2>; device-width = <2>; - partition@0x0 { + partition@0 { label = "boot loader area"; reg = <0x00000000 0x00400000>; }; - partition@0x400000 { + partition@400000 { label = "kernel image"; reg = <0x00400000 0x00600000>; }; - partition@0xa00000 { + partition@a00000 { label = "data"; reg = <0x00a00000 0x005e0000>; }; - partition@0xfe0000 { + partition@fe0000 { label = "boot environment"; reg = <0x00fe0000 0x00020000>; };
arch/xtensa/boot/dts/xtfpga-flash-4m.dtsi +2 -2
@@ -8,11 +8,11 @@ flash: flash@08000000 { reg = <0x08000000 0x00400000>; bank-width = <2>; device-width = <2>; - partition@0x0 { + partition@0 { label = "boot loader area"; reg = <0x00000000 0x003f0000>; }; - partition@0x3f0000 { + partition@3f0000 { label = "boot environment"; reg = <0x003f0000 0x00010000>; };
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 90/98 MIPS: ingenic: correct unit node address
In reply to Sasha LevinFrom: Krzysztof Kozlowski <[email protected]>
[ Upstream commit 8931ddd8d6a55fcefb20f44a38ba42bb746f0b62 ]
Unit node addresses should not have leading 0x:
Warning (unit_address_format): /nemc@13410000/efuse@d0/eth-mac-addr@0x22: unit name should not have leading "0x"
--- arch/mips/boot/dts/ingenic/jz4780.dtsi | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
arch/mips/boot/dts/ingenic/jz4780.dtsi +1 -1
@@ -450,7 +450,7 @@ efuse: efuse@d0 { #address-cells = <1>; #size-cells = <1>; - eth0_addr: eth-mac-addr@0x22 { + eth0_addr: eth-mac-addr@22 { reg = <0x22 0x6>; }; };
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 91/98 Bluetooth: Fix use after free in hci_send_acl
In reply to Sasha LevinFrom: Luiz Augusto von Dentz <[email protected]>
[ Upstream commit f63d24baff787e13b723d86fe036f84bdbc35045 ]
This fixes the following trace caused by receiving HCI_EV_DISCONN_PHY_LINK_COMPLETE which does call hci_conn_del without first checking if conn->type is in fact AMP_LINK and in case it is do properly cleanup upper layers with hci_disconn_cfm:
==================================================================
BUG: KASAN: use-after-free in hci_send_acl+0xaba/0xc50
Read of size 8 at addr ffff88800e404818 by task bluetoothd/142
CPU: 0 PID: 142 Comm: bluetoothd Not tainted
5.17.0-rc5-00006-gda4022eeac1a #7
Hardware name: QEMU Standard PC (i440FX + PIIX, 1996), BIOS
rel-1.14.0-0-g155821a1990b-prebuilt.qemu.org 04/01/2014
Call Trace:
<TASK>
dump_stack_lvl+0x45/0x59
print_address_description.constprop.0+0x1f/0x150
kasan_report.cold+0x7f/0x11b
hci_send_acl+0xaba/0xc50
l2cap_do_send+0x23f/0x3d0
l2cap_chan_send+0xc06/0x2cc0
l2cap_sock_sendmsg+0x201/0x2b0
sock_sendmsg+0xdc/0x110
sock_write_iter+0x20f/0x370
do_iter_readv_writev+0x343/0x690
do_iter_write+0x132/0x640
vfs_writev+0x198/0x570
do_writev+0x202/0x280
do_syscall_64+0x38/0x90
entry_SYSCALL_64_after_hwframe+0x44/0xae
RSP: 002b:00007ffce8a099b8 EFLAGS: 00000246 ORIG_RAX: 0000000000000014
Code: 0f 00 f7 d8 64 89 02 48 c7 c0 ff ff ff ff eb b8 0f 1f 00 f3
0f 1e fa 64 8b 04 25 18 00 00 00 85 c0 75 10 b8 14 00 00 00 0f 05
<48> 3d 00 f0 ff ff 77 51 c3 48 83 ec 28 89 54 24 1c 48 89 74 24 10
RDX: 0000000000000001 RSI: 00007ffce8a099e0 RDI: 0000000000000015
RAX: ffffffffffffffda RBX: 00007ffce8a099e0 RCX: 00007f788fc3cf77
R10: 00007ffce8af7080 R11: 0000000000000246 R12: 000055e4ccf75580
RBP: 0000000000000015 R08: 0000000000000002 R09: 0000000000000001
</TASK>
R13: 000055e4ccf754a0 R14: 000055e4ccf75cd0 R15: 000055e4ccf4a6b0
Allocated by task 45:
kasan_save_stack+0x1e/0x40
__kasan_kmalloc+0x81/0xa0
hci_chan_create+0x9a/0x2f0
l2cap_conn_add.part.0+0x1a/0xdc0
l2cap_connect_cfm+0x236/0x1000
le_conn_complete_evt+0x15a7/0x1db0
hci_le_conn_complete_evt+0x226/0x2c0
hci_le_meta_evt+0x247/0x450
hci_event_packet+0x61b/0xe90
hci_rx_work+0x4d5/0xc50
process_one_work+0x8fb/0x15a0
worker_thread+0x576/0x1240
kthread+0x29d/0x340
ret_from_fork+0x1f/0x30
Freed by task 45:
kasan_save_stack+0x1e/0x40
kasan_set_track+0x21/0x30
kasan_set_free_info+0x20/0x30
__kasan_slab_free+0xfb/0x130
kfree+0xac/0x350
hci_conn_cleanup+0x101/0x6a0
hci_conn_del+0x27e/0x6c0
hci_disconn_phylink_complete_evt+0xe0/0x120
hci_event_packet+0x812/0xe90
hci_rx_work+0x4d5/0xc50
process_one_work+0x8fb/0x15a0
worker_thread+0x576/0x1240
kthread+0x29d/0x340
ret_from_fork+0x1f/0x30
The buggy address belongs to the object at ffff88800c0f0500
The buggy address is located 24 bytes inside of
which belongs to the cache kmalloc-128 of size 128
The buggy address belongs to the page:
128-byte region [ffff88800c0f0500, ffff88800c0f0580)
flags: 0x100000000000200(slab|node=0|zone=1)
page:00000000fe45cd86 refcount:1 mapcount:0
mapping:0000000000000000 index:0x0 pfn:0xc0f0
raw: 0000000000000000 0000000080100010 00000001ffffffff
0000000000000000
raw: 0100000000000200 ffffea00003a2c80 dead000000000004
ffff8880078418c0
page dumped because: kasan: bad access detected
ffff88800c0f0400: 00 00 00 00 00 00 00 00 00 00 00 00 00 fc fc fc
Memory state around the buggy address:
>ffff88800c0f0500: fa fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb
ffff88800c0f0480: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
ffff88800c0f0580: fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc fc
^
==================================================================
ffff88800c0f0600: fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb fb--- net/bluetooth/hci_event.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
net/bluetooth/hci_event.c +2 -1
@@ -5153,8 +5153,9 @@ static void hci_disconn_phylink_complete_evt(struct hci_dev *hdev,hci_dev_lock (hdev); hcon =hci_conn_hash_lookup_handle (hdev, ev->phy_handle); -if (hcon) { +if (hcon && hcon->type ==AMP_LINK ) { hcon->state =BT_CLOSED ; +hci_disconn_cfm (hcon, ev->reason);hci_conn_del (hcon); }
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 92/98 netfilter: conntrack: revisit gc autotuning
In reply to Sasha LevinFrom: Florian Westphal <[email protected]>
[ Upstream commit 2cfadb761d3d0219412fd8150faea60c7e863833 ]
as of commit 4608fdfc07e1
("netfilter: conntrack: collect all entries in one cycle") conntrack gc was changed to run every 2 minutes.
On systems where conntrack hash table is set to large value, most evictions happen from gc worker rather than the packet path due to hash table distribution.
This causes netlink event overflows when events are collected.
This change collects average expiry of scanned entries and reschedules to the average remaining value, within 1 to 60 second interval.
To avoid event overflows, reschedule after each bucket and add a limit for both run time and number of evictions per run.
If more entries have to be evicted, reschedule and restart 1 jiffy into the future.
--- net/netfilter/nf_conntrack_core.c | 85 ++++++++++++++++++++++++------- 1 file changed, 68 insertions(+), 17 deletions(-)
net/netfilter/nf_conntrack_core.c +68 -17
@@ -66,6 +66,8 @@ EXPORT_SYMBOL_GPL(nf_conntrack_hash);struct conntrack_gc_work {struct delayed_work dwork;u32 next_bucket; +u32 avg_timeout; +u32 start_time;bool exiting;bool early_drop; };
@@ -77,8 +79,19 @@ static __read_mostly bool nf_conntrack_locks_all;/* serialize hash resizes and nf_ct_iterate_cleanup */ static DEFINE_MUTEX (nf_conntrack_mutex); -#define GC_SCAN_INTERVAL (120u * HZ) +#define GC_SCAN_INTERVAL_MAX (60ul * HZ) +#define GC_SCAN_INTERVAL_MIN (1ul * HZ) + +/* clamp timeouts to this value (TCP unacked) */ +#define GC_SCAN_INTERVAL_CLAMP (300ul * HZ) + +/* large initial bias so that we don't scan often just because we have +* three entries with a 1s timeout. +*/ +#define GC_SCAN_INTERVAL_INIT INT_MAX +#define GC_SCAN_MAX_DURATION msecs_to_jiffies(10) +#define GC_SCAN_EXPIRED_MAX (64000u / HZ)#define MIN_CHAINLEN 8u#define MAX_CHAINLEN (32u - MIN_CHAINLEN)
@@ -1420,16 +1433,28 @@ static bool gc_worker_can_early_drop(const struct nf_conn *ct)static void gc_worker (struct work_struct *work) { -unsigned long end_time = jiffies +GC_SCAN_MAX_DURATION ;unsigned int i, hashsz, nf_conntrack_max95 =0 ; -unsigned long next_run =GC_SCAN_INTERVAL ; +u32 end_time, start_time = nfct_time_stamp;struct conntrack_gc_work *gc_work; +unsigned int expired_count =0 ; +unsigned long next_run; +s32 delta_time; + gc_work = container_of(work, struct conntrack_gc_work, dwork.work); i = gc_work->next_bucket;if (gc_work->early_drop) nf_conntrack_max95 = nf_conntrack_max /100u *95u ; +if (i ==0 ) { + gc_work->avg_timeout =GC_SCAN_INTERVAL_INIT ; + gc_work->start_time = start_time; + } + + next_run = gc_work->avg_timeout; + + end_time = start_time +GC_SCAN_MAX_DURATION ; + do { struct nf_conntrack_tuple_hash *h; struct hlist_nulls_head *ct_hash;
@@ -1446,6 +1471,7 @@ static void gc_worker(struct work_struct *work)hlist_nulls_for_each_entry_rcu (h, n, &ct_hash[i], hnnode) {struct nf_conntrack_net *cnet; +unsigned long expires;struct net *net; tmp =nf_ct_tuplehash_to_ctrack (h);
@@ -1455,11 +1481,29 @@ static void gc_worker(struct work_struct *work)continue ; } +if (expired_count >GC_SCAN_EXPIRED_MAX ) { +rcu_read_unlock (); + + gc_work->next_bucket = i; + gc_work->avg_timeout = next_run; + + delta_time = nfct_time_stamp - gc_work->start_time; + +/* re-sched immediately if total cycle time is exceeded */ + next_run = delta_time < (s32 )GC_SCAN_INTERVAL_MAX ; + goto early_exit; + } +if (nf_ct_is_expired (tmp)) {nf_ct_gc_expired (tmp); + expired_count++;continue ; } + expires =clamp (nf_ct_expires (tmp),GC_SCAN_INTERVAL_MIN ,GC_SCAN_INTERVAL_CLAMP ); + next_run += expires; + next_run /=2u ; +if (nf_conntrack_max95 ==0 ||gc_worker_skip_ct (tmp))continue ;
@@ -1477,8 +1521,10 @@ static void gc_worker(struct work_struct *work)continue ; } -if (gc_worker_can_early_drop (tmp)) +if (gc_worker_can_early_drop (tmp)) {nf_ct_kill (tmp); + expired_count++; + }nf_ct_put (tmp); }
@@ -1491,33 +1537,38 @@ static void gc_worker(struct work_struct *work)cond_resched (); i++; -if (time_after (jiffies, end_time) && i < hashsz) { + delta_time = nfct_time_stamp - end_time; +if (delta_time >0 && i < hashsz) { + gc_work->avg_timeout = next_run; gc_work->next_bucket = i; next_run =0 ; -break ; + goto early_exit; } }while (i < hashsz); + gc_work->next_bucket =0 ; + + next_run =clamp (next_run,GC_SCAN_INTERVAL_MIN ,GC_SCAN_INTERVAL_MAX ); + + delta_time =max_t (s32, nfct_time_stamp - gc_work->start_time,1 ); +if (next_run > (unsigned long )delta_time) + next_run -= delta_time; +else + next_run =1 ; + +early_exit:if (gc_work->exiting)return ; -/* -* Eviction will normally happen from the packet path, and not -* from this gc worker. -* -* This worker is only here to reap expired entries when system went -* idle after a busy period. -*/ -if (next_run) { +if (next_run) gc_work->early_drop = false; - gc_work->next_bucket =0 ; - } +queue_delayed_work (system_power_efficient_wq, &gc_work->dwork, next_run); }static void conntrack_gc_work_init (struct conntrack_gc_work *gc_work) { -INIT_DEFERRABLE_WORK (&gc_work->dwork, gc_worker); +INIT_DELAYED_WORK (&gc_work->dwork, gc_worker); gc_work->exiting = false; }
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 93/98 netlabel: fix out-of-bounds memory accesses
In reply to Sasha LevinFrom: Wang Yufen <[email protected]>
[ Upstream commit f22881de730ebd472e15bcc2c0d1d46e36a87b9c ]
In calipso_map_cat_ntoh(), in the for loop, if the return value of netlbl_bitmap_walk() is equal to (net_clen_bits - 1), when netlbl_bitmap_walk() is called next time, out-of-bounds memory accesses of bitmap[byte_offset] occurs.
The bug was found during fuzzing. The following is the fuzzing report
BUG: KASAN: slab-out-of-bounds in netlbl_bitmap_walk+0x3c/0xd0 Read of size 1 at addr ffffff8107bf6f70 by task err_OH/252 CPU: 7 PID: 252 Comm: err_OH Not tainted 5.17.0-rc7+ #17 Hardware name: linux,dummy-virt (DT) Call trace: dump_backtrace+0x21c/0x230 show_stack+0x1c/0x60 dump_stack_lvl+0x64/0x7c print_address_description.constprop.0+0x70/0x2d0 __kasan_report+0x158/0x16c kasan_report+0x74/0x120 __asan_load1+0x80/0xa0 netlbl_bitmap_walk+0x3c/0xd0 calipso_opt_getattr+0x1a8/0x230 calipso_sock_getattr+0x218/0x340 calipso_sock_getattr+0x44/0x60 netlbl_sock_getattr+0x44/0x80 selinux_netlbl_socket_setsockopt+0x138/0x170 selinux_socket_setsockopt+0x4c/0x60 security_socket_setsockopt+0x4c/0x90 __sys_setsockopt+0xbc/0x2b0 __arm64_sys_setsockopt+0x6c/0x84 invoke_syscall+0x64/0x190 el0_svc_common.constprop.0+0x88/0x200 do_el0_svc+0x88/0xa0 el0_svc+0x128/0x1b0 el0t_64_sync_handler+0x9c/0x120 el0t_64_sync+0x16c/0x170
--- net/netlabel/netlabel_kapi.c | 2 ++ 1 file changed, 2 insertions(+)
net/netlabel/netlabel_kapi.c +2 -0
@@ -885,6 +885,8 @@ int netlbl_bitmap_walk(const unsigned char *bitmap, u32 bitmap_len,unsigned char bitmask;unsigned char byte; +if (offset >= bitmap_len) +return -1 ; byte_offset = offset /8 ; byte = bitmap[byte_offset]; bit_spot = offset;
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 94/98 ceph: fix inode reference leakage in ceph_get_snapdir()
In reply to Sasha LevinFrom: Xiubo Li <[email protected]>
[ Upstream commit 322794d3355c33adcc4feace0045d85a8e4ed813 ]
The ceph_get_inode() will search for or insert a new inode into the hash for the given vino, and return a reference to it. If new is non-NULL, its reference is consumed.
We should release the reference when in error handing cases.
--- fs/ceph/inode.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-)
fs/ceph/inode.c +8 -2
@@ -87,13 +87,13 @@ struct inode *ceph_get_snapdir(struct inode *parent)if (!S_ISDIR (parent->i_mode)) {pr_warn_once ("bad snapdir parent type (mode=0%o)\n" , parent->i_mode); -return ERR_PTR (-ENOTDIR ); + goto err; }if (!(inode->i_state &I_NEW ) && !S_ISDIR (inode->i_mode)) {pr_warn_once ("bad snapdir inode type (mode=0%o)\n" , inode->i_mode); -return ERR_PTR (-ENOTDIR ); + goto err; } inode->i_mode = parent->i_mode;
@@ -113,6 +113,12 @@ struct inode *ceph_get_snapdir(struct inode *parent) }return inode; +err: +if ((inode->i_state &I_NEW )) +discard_new_inode (inode); +else +iput (inode); +return ERR_PTR (-ENOTDIR ); }const struct inode_operations ceph_file_iops = {
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 95/98 ceph: fix memory leak in ceph_readdir when note_last_dentry returns error
In reply to Sasha LevinFrom: Xiubo Li <[email protected]>
[ Upstream commit f639d9867eea647005dc824e0e24f39ffc50d4e4 ]
Reset the last_readdir at the same time, and add a comment explaining why we don't free last_readdir when dir_emit returns false.
--- fs/ceph/dir.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
fs/ceph/dir.c +10 -1
@@ -478,8 +478,11 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx) 2 : (fpos_off(rde->offset) + 1); err =note_last_dentry (dfi, rde->name, rde->name_len, next_offset); -if (err) +if (err) { +ceph_mdsc_put_request (dfi->last_readdir); + dfi->last_readdir =NULL ;return err; + } }else if (req->r_reply_info.dir_end) { dfi->next_offset =2 ;/* keep last name */
@@ -520,6 +523,12 @@ static int ceph_readdir(struct file *file, struct dir_context *ctx)if (!dir_emit (ctx, rde->name, rde->name_len,ceph_present_ino (inode->i_sb,le64_to_cpu (rde->inode.in->ino)),le32_to_cpu (rde->inode.in->mode) >>12 )) { +/* +* NOTE: Here no need to put the 'dfi->last_readdir', +* because when dir_emit stops us it's most likely +* doesn't have enough memory, etc. So for next readdir +* it will continue. +*/ dout ("filldir stopping us...\n" );return 0 ; }
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 96/98 lib/Kconfig.debug: add ARCH dependency for FUNCTION_ALIGN option
In reply to Sasha LevinFrom: Feng Tang <[email protected]>
[ Upstream commit 1bf18da62106225dbc47aab41efee2aeb99caccd ]
0Day robots reported there is compiling issue for 'csky' ARCH when CONFIG_DEBUG_FORCE_DATA_SECTION_ALIGNED is enabled [1]:
All errors (new ones prefixed by >>):
{standard input}: Assembler messages:
Quoted 1 line
Quoted 1 line
{standard input}:2277: Error: pcrel offset for branch to .LS000B too far (
0x3c)
Which was discussed in [2]. And as there is no solution for csky yet, add some dependency for this config to limit it to several ARCHs which have no compiling issue so far.
[1]. https://lore.kernel.org/lkml/[email protected]/
[2]. https://www.spinics.net/lists/linux-kbuild/msg30298.html
--- lib/Kconfig.debug | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
lib/Kconfig.debug +2 -1
@@ -414,7 +414,8 @@ config SECTION_MISMATCH_WARN_ONLY If unsure, say Y. config DEBUG_FORCE_FUNCTION_ALIGN_64B - bool "Force all function address 64B aligned" if EXPERT + bool "Force all function address 64B aligned" + depends on EXPERT && (X86_64 || ARM64 || PPC32 || PPC64 || ARC) help There are cases that a commit from one domain changes the function address alignment of other domains, and cause magic performance
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 97/98 init/main.c: return 1 from handled __setup() functions
In reply to Sasha LevinFrom: Randy Dunlap <[email protected]>
[ Upstream commit f9a40b0890658330c83c95511f9d6b396610defc ]
initcall_blacklist() should return 1 to indicate that it handled its cmdline arguments.
set_debug_rodata() should return 1 to indicate that it handled its cmdline arguments. Print a warning if the option string is invalid.
This prevents these strings from being added to the 'init' program's environment as they are not init arguments/parameters.
--- init/main.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
init/main.c +4 -2
@@ -1198,7 +1198,7 @@ static int __init initcall_blacklist(char *str) } }while (str_entry); -return 0 ; +return 1 ; } static bool __init_or_module initcall_blacklisted(initcall_t fn)
@@ -1460,7 +1460,9 @@ static noinline void __init kernel_init_freeable(void);bool rodata_enabled__ro_after_init = true;static int __init set_debug_rodata (char *str) { -return strtobool (str, &rodata_enabled); +if (strtobool (str, &rodata_enabled)) +pr_warn ("Invalid option string for rodata: '%s'\n" , str); +return 1 ; }__setup ("rodata=" , set_debug_rodata);#endif
Signature · 1 line
2.34.1
Sasha Levin
maintainerPATCH 98/98 minix: fix bug when opening a file with O_DIRECT
In reply to Sasha LevinFrom: Qinghua Jin <[email protected]>
[ Upstream commit 9ce3c0d26c42d279b6c378a03cd6a61d828f19ca ]
Testcase:
1. create a minix file system and mount it
2. open a file on the file system with O_RDWR|O_CREAT|O_TRUNC|O_DIRECT
3. open fails with -EINVAL but leaves an empty file behind. All other open() failures don't leave the failed open files behind.
It is hard to check the direct_IO op before creating the inode. Just as ext4 and btrfs do, this patch will resolve the issue by allowing to create the file with O_DIRECT but returning error when writing the file.
--- fs/minix/inode.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
fs/minix/inode.c +2 -1
@@ -447,7 +447,8 @@ static const struct address_space_operations minix_aops = { .writepage = minix_writepage, .write_begin = minix_write_begin, .write_end = generic_write_end, - .bmap = minix_bmap + .bmap = minix_bmap, + .direct_IO = noop_direct_IO };static const struct inode_operations minix_symlink_inode_operations = {
Signature · 1 line
2.34.1