nvme_fc: add module to ops template to allow module references
Subsystems (13)
Sasha Levin
maintainerPATCH 1/34 nvme_fc: add module to ops template to allow module references
From: James Smart <[email protected]>
[ Upstream commit 863fbae929c7a5b64e96b8a3ffb34a29eefb9f8f ]
In nvme-fc: it's possible to have connected active controllers and as no references are taken on the LLDD, the LLDD can be unloaded. The controller would enter a reconnect state and as long as the LLDD resumed within the reconnect timeout, the controller would resume. But if a namespace on the controller is the root device, allowing the driver to unload can be problematic. To reload the driver, it may require new io to the boot device, and as it's no longer connected we get into a catch-22 that eventually fails, and the system locks up.
Fix this issue by taking a module reference for every connected controller (which is what the core layer did to the transport module). Reference is cleared when the controller is removed.
--- drivers/nvme/host/fc.c | 14 ++++++++++++-- drivers/nvme/target/fcloop.c | 1 + drivers/scsi/lpfc/lpfc_nvme.c | 2 ++ drivers/scsi/qla2xxx/qla_nvme.c | 1 + include/linux/nvme-fc-driver.h | 4 ++++ 5 files changed, 20 insertions(+), 2 deletions(-)
drivers/nvme/host/fc.c +12 -2
@@ -342,7 +342,8 @@ nvme_fc_register_localport(struct nvme_fc_port_info *pinfo, !template->ls_req || !template->fcp_io || !template->ls_abort || !template->fcp_abort || !template->max_hw_queues || !template->max_sgl_segments || - !template->max_dif_sgl_segments || !template->dma_boundary) { + !template->max_dif_sgl_segments || !template->dma_boundary || + !template->module) { ret = -EINVAL; goto out_reghost_failed; }
@@ -1986,6 +1987,7 @@ nvme_fc_ctrl_free(struct kref *ref) {struct nvme_fc_ctrl *ctrl = container_of(ref, struct nvme_fc_ctrl, ref); +struct nvme_fc_lport *lport = ctrl->lport;unsigned long flags;if (ctrl->ctrl.tagset) {
@@ -2011,6 +2013,7 @@ nvme_fc_ctrl_free(struct kref *ref)if (ctrl->ctrl.opts)nvmf_free_options (ctrl->ctrl.opts);kfree (ctrl); +module_put (lport->ops->module); } static void
@@ -3040,10 +3043,15 @@ nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts, goto out_fail; } +if (!try_module_get (lport->ops->module)) { + ret = -EUNATCH ; + goto out_free_ctrl; + } + idx =ida_simple_get (&nvme_fc_ctrl_cnt,0 ,0 ,GFP_KERNEL );if (idx <0 ) { ret = -ENOSPC ; - goto out_free_ctrl; + goto out_mod_put; } ctrl->ctrl.opts = opts;
@@ -3185,6 +3193,8 @@ nvme_fc_init_ctrl(struct device *dev, struct nvmf_ctrl_options *opts, out_free_ida:put_device (ctrl->dev);ida_simple_remove (&nvme_fc_ctrl_cnt, ctrl->cnum); +out_mod_put: +module_put (lport->ops->module); out_free_ctrl:kfree (ctrl); out_fail:
drivers/nvme/target/fcloop.c +1 -0
@@ -825,6 +825,7 @@ fcloop_targetport_delete(struct nvmet_fc_target_port *targetport)#define FCLOOP_DMABOUND_4G 0xFFFFFFFFstatic struct nvme_fc_port_template fctemplate = { + .module =THIS_MODULE , .localport_delete = fcloop_localport_delete, .remoteport_delete = fcloop_remoteport_delete, .create_queue = fcloop_create_queue,
drivers/scsi/lpfc/lpfc_nvme.c +2 -0
@@ -1903,6 +1903,8 @@ lpfc_nvme_fcp_abort(struct nvme_fc_local_port *pnvme_lport,/* Declare and initialization an instance of the FC NVME template. */ static struct nvme_fc_port_template lpfc_nvme_template = { + .module =THIS_MODULE , +/* initiator-based functions */ .localport_delete = lpfc_nvme_localport_delete, .remoteport_delete = lpfc_nvme_remoteport_delete,
drivers/scsi/qla2xxx/qla_nvme.c +1 -0
@@ -560,6 +560,7 @@ static void qla_nvme_remoteport_delete(struct nvme_fc_remote_port *rport) }static struct nvme_fc_port_template qla_nvme_fc_transport = { + .module =THIS_MODULE , .localport_delete = qla_nvme_localport_delete, .remoteport_delete = qla_nvme_remoteport_delete, .create_queue = qla_nvme_alloc_queue,
include/linux/nvme-fc-driver.h +4 -0
@@ -282,6 +282,8 @@ struct nvme_fc_remote_port {* * Host/Initiator Transport Entrypoints/Parameters: * +* @module: The LLDD module using the interface +* * @localport_delete: The LLDD initiates deletion of a localport via * nvme_fc_deregister_localport(). However, the teardown is * asynchronous. This routine is called upon the completion of the
@@ -395,6 +397,8 @@ struct nvme_fc_remote_port {* Value is Mandatory. Allowed to be zero. */ struct nvme_fc_port_template { +struct module *module; +/* initiator-based functions */ void (*localport_delete)(struct nvme_fc_local_port *);void (*remoteport_delete)(struct nvme_fc_remote_port *);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 2/34 nvme-fc: fix double-free scenarios on hw queues
From: James Smart <[email protected]>
[ Upstream commit c869e494ef8b5846d9ba91f1e922c23cd444f0c1 ]
If an error occurs on one of the ios used for creating an association, the creating routine has error paths that are invoked by the command failure and the error paths will free up the controller resources created to that point.
But... the io was ultimately determined by an asynchronous completion routine that detected the error and which unconditionally invokes the error_recovery path which calls delete_association. Delete association deletes all outstanding io then tears down the controller resources. So the create_association thread can be running in parallel with the error_recovery thread. What was seen was the LLDD received a call to delete a queue, causing the LLDD to do a free of a resource, then the transport called the delete queue again causing the driver to repeat the free call. The second free routine corrupted the allocator. The transport shouldn't be making the duplicate call, and the delete queue is just one of the resources being freed.
To fix, it is realized that the create_association path is completely serialized with one command at a time. So the failed io completion will always be seen by the create_association path and as of the failure, there are no ios to terminate and there is no reason to be manipulating queue freeze states, etc. The serialized condition stays true until the controller is transitioned to the LIVE state. Thus the fix is to change the error recovery path to check the controller state and only invoke the teardown path if not already in the CONNECTING state.
--- drivers/nvme/host/fc.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-)
drivers/nvme/host/fc.c +15 -3
@@ -2894,10 +2894,22 @@ nvme_fc_reconnect_or_delete(struct nvme_fc_ctrl *ctrl, int status)static void __nvme_fc_terminate_io (struct nvme_fc_ctrl *ctrl) { -nvme_stop_keep_alive (&ctrl->ctrl); +/* +* if state is connecting - the error occurred as part of a +* reconnect attempt. The create_association error paths will +* clean up any outstanding io. +* +* if it's a different state - ensure all pending io is +* terminated. Given this can delay while waiting for the +* aborted io to return, we recheck adapter state below +* before changing state. +*/ +if (ctrl->ctrl.state !=NVME_CTRL_CONNECTING ) { +nvme_stop_keep_alive (&ctrl->ctrl); -/* will block will waiting for io to terminate */ -nvme_fc_delete_association (ctrl); +/* will block will waiting for io to terminate */ +nvme_fc_delete_association (ctrl); + }if (ctrl->ctrl.state !=NVME_CTRL_CONNECTING && !nvme_change_ctrl_state (&ctrl->ctrl,NVME_CTRL_CONNECTING ))
Signature · 7 lines
2.20.1 _______________________________________________ linux-nvme mailing list [email protected] http://lists.infradead.org/mailman/listinfo/linux-nvme
Sasha Levin
maintainerPATCH 3/34 drm/amdgpu: add check before enabling/disabling broadcast mode
In reply to Sasha LevinFrom: Guchun Chen <[email protected]>
[ Upstream commit 6e807535dae5dbbd53bcc5e81047a20bf5eb08ea ]
When security violation from new vbios happens, data fabric is risky to stop working. So prevent the direct access to DF mmFabricConfigAccessControl from the new vbios and onwards.
--- drivers/gpu/drm/amd/amdgpu/df_v3_6.c | 38 ++++++++++++++++------------ 1 file changed, 22 insertions(+), 16 deletions(-)
drivers/gpu/drm/amd/amdgpu/df_v3_6.c +22 -16
@@ -75,23 +75,29 @@ static void df_v3_6_update_medium_grain_clock_gating(struct amdgpu_device *adev, {u32 tmp; -/* Put DF on broadcast mode */ - adev->df_funcs->enable_broadcast_mode (adev, true); - -if (enable && (adev->cg_flags &AMD_CG_SUPPORT_DF_MGCG )) { - tmp =RREG32_SOC15 (DF ,0 , mmDF_PIE_AON0_DfGlobalClkGater); - tmp &= ~DF_PIE_AON0_DfGlobalClkGater__MGCGMode_MASK; - tmp |=DF_V3_6_MGCG_ENABLE_15_CYCLE_DELAY ; -WREG32_SOC15 (DF ,0 , mmDF_PIE_AON0_DfGlobalClkGater, tmp); - }else { - tmp =RREG32_SOC15 (DF ,0 , mmDF_PIE_AON0_DfGlobalClkGater); - tmp &= ~DF_PIE_AON0_DfGlobalClkGater__MGCGMode_MASK; - tmp |=DF_V3_6_MGCG_DISABLE ; -WREG32_SOC15 (DF ,0 , mmDF_PIE_AON0_DfGlobalClkGater, tmp); +if (adev->cg_flags &AMD_CG_SUPPORT_DF_MGCG ) { +/* Put DF on broadcast mode */ + adev->df_funcs->enable_broadcast_mode (adev, true); + +if (enable) { + tmp =RREG32_SOC15 (DF ,0 , + mmDF_PIE_AON0_DfGlobalClkGater); + tmp &= ~DF_PIE_AON0_DfGlobalClkGater__MGCGMode_MASK; + tmp |=DF_V3_6_MGCG_ENABLE_15_CYCLE_DELAY ; +WREG32_SOC15 (DF ,0 , + mmDF_PIE_AON0_DfGlobalClkGater, tmp); + }else { + tmp =RREG32_SOC15 (DF ,0 , + mmDF_PIE_AON0_DfGlobalClkGater); + tmp &= ~DF_PIE_AON0_DfGlobalClkGater__MGCGMode_MASK; + tmp |=DF_V3_6_MGCG_DISABLE ; +WREG32_SOC15 (DF ,0 , + mmDF_PIE_AON0_DfGlobalClkGater, tmp); + } + +/* Exit broadcast mode */ + adev->df_funcs->enable_broadcast_mode (adev, false); } - -/* Exit broadcast mode */ - adev->df_funcs->enable_broadcast_mode (adev, false); } static void df_v3_6_get_clockgating_state(struct amdgpu_device *adev,
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 4/34 drm/amdgpu: add cache flush workaround to gfx8 emit_fence
In reply to Sasha LevinFrom: Pierre-Eric Pelloux-Prayer <[email protected]>
[ Upstream commit bf26da927a1cd57c9deb2db29ae8cf276ba8b17b ]
The same workaround is used for gfx7.
Both PAL and Mesa use it for gfx8 too, so port this commit to gfx_v8_0_ring_emit_fence_gfx.
--- drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 22 +++++++++++++++++++--- 1 file changed, 19 insertions(+), 3 deletions(-)
drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c +19 -3
@@ -6405,7 +6405,23 @@ static void gfx_v8_0_ring_emit_fence_gfx(struct amdgpu_ring *ring, u64 addr,bool write64bit = flags &AMDGPU_FENCE_FLAG_64BIT ;bool int_sel = flags &AMDGPU_FENCE_FLAG_INT ; -/* EVENT_WRITE_EOP - flush caches, send int */ +/* Workaround for cache flush problems. First send a dummy EOP +* event down the pipe with seq one below. +*/ +amdgpu_ring_write (ring,PACKET3 (PACKET3_EVENT_WRITE_EOP ,4 )); +amdgpu_ring_write (ring, (EOP_TCL1_ACTION_EN | +EOP_TC_ACTION_EN | +EOP_TC_WB_ACTION_EN | +EVENT_TYPE (CACHE_FLUSH_AND_INV_TS_EVENT ) | +EVENT_INDEX (5 ))); +amdgpu_ring_write (ring, addr &0xfffffffc ); +amdgpu_ring_write (ring, (upper_32_bits (addr) &0xffff ) | +DATA_SEL (1 ) |INT_SEL (0 )); +amdgpu_ring_write (ring,lower_32_bits (seq -1 )); +amdgpu_ring_write (ring,upper_32_bits (seq -1 )); + +/* Then send the real EOP event down the pipe: +* EVENT_WRITE_EOP - flush caches, send int */ amdgpu_ring_write (ring,PACKET3 (PACKET3_EVENT_WRITE_EOP ,4 )); amdgpu_ring_write(ring, (EOP_TCL1_ACTION_EN | EOP_TC_ACTION_EN |
@@ -7154,7 +7170,7 @@ static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_gfx = {5 +/* COND_EXEC */ 7 +/* PIPELINE_SYNC */ VI_FLUSH_GPU_TLB_NUM_WREG *5 +9 +/* VM_FLUSH */ -8 +/* FENCE for VM_FLUSH */ +12 +/* FENCE for VM_FLUSH */ 20 +/* GDS switch */ 4 +/* double SWITCH_BUFFER, the first COND_EXEC jump to the place just
@@ -7166,7 +7182,7 @@ static const struct amdgpu_ring_funcs gfx_v8_0_ring_funcs_gfx = {31 +/* DE_META */ 3 +/* CNTX_CTRL */ 5 +/* HDP_INVL */ -8 +8 +/* FENCE x2 */ +12 +12 +/* FENCE x2 */ 2, /* SWITCH_BUFFER */ .emit_ib_size = 4, /* gfx_v8_0_ring_emit_ib_gfx */ .emit_ib = gfx_v8_0_ring_emit_ib_gfx,
Signature · 6 lines
2.20.1 _______________________________________________ amd-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/amd-gfx
Sasha Levin
maintainerPATCH 5/34 drm/amd/display: Fixed kernel panic when booting with DP-to-HDMI dongle
In reply to Sasha LevinFrom: David Galiffi <[email protected]>
[ Upstream commit a51d9f8fe756beac51ce26ef54195da00a260d13 ]
[Why]
In dc_link_is_dp_sink_present, if dal_ddc_open fails, then dal_gpio_destroy_ddc is called, destroying pin_data and pin_clock. They are created only on dc_construct, and next aux access will cause a panic.
[How]
Instead of calling dal_gpio_destroy_ddc, call dal_ddc_close.
--- drivers/gpu/drm/amd/display/dc/core/dc_link.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/gpu/drm/amd/display/dc/core/dc_link.c +1 -1
@@ -348,7 +348,7 @@ bool dc_link_is_dp_sink_present(struct dc_link *link)if (GPIO_RESULT_OK !=dal_ddc_open ( ddc,GPIO_MODE_INPUT ,GPIO_DDC_CONFIG_TYPE_MODE_I2C )) { -dal_gpio_destroy_ddc (&ddc); +dal_ddc_close (ddc);return present; }
Signature · 6 lines
2.20.1 _______________________________________________ dri-devel mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/dri-devel
Sasha Levin
maintainerPATCH 6/34 iio: adc: max9611: Fix too short conversion time delay
In reply to Sasha LevinFrom: Geert Uytterhoeven <[email protected]>
[ Upstream commit 9fd229c478fbf77c41c8528aa757ef14210365f6 ]
As of commit b9ddd5091160793e ("iio: adc: max9611: Fix temperature reading in probe"), max9611 initialization sometimes fails on the Salvator-X(S) development board with:
max9611 4-007f: Invalid value received from ADC 0x8000: aborting
max9611: probe of 4-007f failed with error -5The max9611 driver tests communications with the chip by reading the die temperature during the probe function, which returns an invalid value.
According to the datasheet, the typical ADC conversion time is 2 ms, but no minimum or maximum values are provided. Maxim Technical Support confirmed this was tested with temperature Ta=25 degreeC, and promised to inform me if a maximum/minimum value is available (they didn't get back to me, so I assume it is not).
However, the driver assumes a 1 ms conversion time. Usually the usleep_range() call returns after more than 1.8 ms, hence it succeeds. When it returns earlier, the data register may be read too early, and the previous measurement value will be returned. After boot, this is the temperature POR (power-on reset) value, causing the failure above.
Fix this by increasing the delay from 1000-2000 µs to 3000-3300 µs.
Note that this issue has always been present, but it was exposed by the aformentioned commit.
--- drivers/iio/adc/max9611.c | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-)
drivers/iio/adc/max9611.c +10 -6
@@ -92,6 +92,12 @@#define MAX9611_TEMP_SCALE_NUM 1000000#define MAX9611_TEMP_SCALE_DIV 2083 +/* +* Conversion time is 2 ms (typically) at Ta=25 degreeC +* No maximum value is known, so play it safe. +*/ +#define MAX9611_CONV_TIME_US_RANGE 3000, 3300 +struct max9611_dev {struct device *dev;struct i2c_client *i2c_client;
@@ -239,11 +245,9 @@ static int max9611_read_single(struct max9611_dev *max9611,return ret; } -/* -* need a delay here to make register configuration -* stabilize. 1 msec at least, from empirical testing. -*/ -usleep_range (1000 ,2000 ); +/* need a delay here to make register configuration stabilize. */ + +usleep_range (MAX9611_CONV_TIME_US_RANGE ); ret =i2c_smbus_read_word_swapped (max9611->i2c_client, reg_addr);if (ret <0 ) {
@@ -510,7 +514,7 @@ static int max9611_init(struct max9611_dev *max9611) MAX9611_REG_CTRL2, 0);return ret; } -usleep_range (1000 ,2000 ); +usleep_range (MAX9611_CONV_TIME_US_RANGE );return 0 ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 7/34 PM / devfreq: Fix devfreq_notifier_call returning errno
In reply to Sasha LevinFrom: Leonard Crestez <[email protected]>
[ Upstream commit e876e710ede23f670494331e062d643928e4142a ]
Notifier callbacks shouldn't return negative errno but one of the NOTIFY_OK/DONE/BAD values.
The OPP core will ignore return values from notifiers but returning a value that matches NOTIFY_STOP_MASK will stop the notification chain.
Fix by always returning NOTIFY_OK.
--- drivers/devfreq/devfreq.c | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-)
drivers/devfreq/devfreq.c +13 -11
@@ -538,26 +538,28 @@ static int devfreq_notifier_call(struct notifier_block *nb, unsigned long type, void *devp) { struct devfreq *devfreq = container_of(nb, struct devfreq, nb); -int ret; +int err = -EINVAL ;mutex_lock (&devfreq->lock); devfreq->scaling_min_freq =find_available_min_freq (devfreq); -if (!devfreq->scaling_min_freq) { -mutex_unlock (&devfreq->lock); -return -EINVAL ; - } +if (!devfreq->scaling_min_freq) + goto out; devfreq->scaling_max_freq =find_available_max_freq (devfreq); -if (!devfreq->scaling_max_freq) { -mutex_unlock (&devfreq->lock); -return -EINVAL ; - } +if (!devfreq->scaling_max_freq) + goto out; + + err =update_devfreq (devfreq); - ret =update_devfreq (devfreq); +out:mutex_unlock (&devfreq->lock); +if (err) +dev_err (devfreq->dev.parent, +"failed to update frequency from OPP notifier (%d)\n" , + err); -return ret; +return NOTIFY_OK ; }/**
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 8/34 PM / devfreq: Set scaling_max_freq to max on OPP notifier error
In reply to Sasha LevinFrom: Leonard Crestez <[email protected]>
[ Upstream commit e7cc792d00049c874010b398a27c3cc7bc8fef34 ]
The devfreq_notifier_call functions will update scaling_min_freq and scaling_max_freq when the OPP table is updated.
If fetching the maximum frequency fails then scaling_max_freq remains set to zero which is confusing. Set to ULONG_MAX instead so we don't need special handling for this case in other places.
--- drivers/devfreq/devfreq.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-)
drivers/devfreq/devfreq.c +3 -1
@@ -547,8 +547,10 @@ static int devfreq_notifier_call(struct notifier_block *nb, unsigned long type, goto out; devfreq->scaling_max_freq =find_available_max_freq (devfreq); -if (!devfreq->scaling_max_freq) +if (!devfreq->scaling_max_freq) { + devfreq->scaling_max_freq =ULONG_MAX ; goto out; + } err =update_devfreq (devfreq);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 9/34 PM / devfreq: Don't fail devfreq_dev_release if not in list
In reply to Sasha LevinFrom: Leonard Crestez <[email protected]>
[ Upstream commit 42a6b25e67df6ee6675e8d1eaf18065bd73328ba ]
Right now devfreq_dev_release will print a warning and abort the rest of the cleanup if the devfreq instance is not part of the global devfreq_list. But this is a valid scenario, for example it can happen if the governor can't be found or on any other init error that happens after device_register.
Initialize devfreq->node to an empty list head in devfreq_add_device so that list_del becomes a safe noop inside devfreq_dev_release and we can continue the rest of the cleanup.
--- drivers/devfreq/devfreq.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-)
drivers/devfreq/devfreq.c +1 -5
@@ -575,11 +575,6 @@ static void devfreq_dev_release(struct device *dev)struct devfreq *devfreq =to_devfreq (dev);mutex_lock (&devfreq_list_lock); -if (IS_ERR (find_device_devfreq (devfreq->dev.parent))) { -mutex_unlock (&devfreq_list_lock); -dev_warn (&devfreq->dev,"releasing devfreq which doesn't exist\n" ); -return ; - }list_del (&devfreq->node);mutex_unlock (&devfreq_list_lock);
@@ -634,6 +629,7 @@ struct devfreq *devfreq_add_device(struct device *dev, devfreq->dev.parent = dev; devfreq->dev.class = devfreq_class; devfreq->dev.release = devfreq_dev_release; +INIT_LIST_HEAD (&devfreq->node); devfreq->profile = profile;strncpy (devfreq->governor_name, governor_name,DEVFREQ_NAME_LEN ); devfreq->previous_freq = profile->initial_freq;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 10/34 afs: Fix afs_find_server lookups for ipv4 peers
In reply to Sasha LevinFrom: Marc Dionne <[email protected]>
[ Upstream commit 9bd0160d12370a076e44f8d1320cde9c83f2c647 ]
afs_find_server tries to find a server that has an address that matches the transport address of an rxrpc peer. The code assumes that the transport address is always ipv6, with ipv4 represented as ipv4 mapped addresses, but that's not the case. If the transport family is AF_INET, srx->transport.sin6.sin6_addr.s6_addr32[] will be beyond the actual ipv4 address and will always be 0, and all ipv4 addresses will be seen as matching.
As a result, the first ipv4 address seen on any server will be considered a match, and the server returned may be the wrong one.
One of the consequences is that callbacks received over ipv4 will only be correctly applied for the server that happens to have the first ipv4 address on the fs_addresses4 list. Callbacks over ipv4 from all other servers are dropped, causing the client to serve stale data.
This is fixed by looking at the transport family, and comparing ipv4 addresses based on a sockaddr_in structure rather than a sockaddr_in6.
--- fs/afs/server.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-)
fs/afs/server.c +8 -13
@@ -34,18 +34,11 @@ static void afs_dec_servers_outstanding(struct afs_net *net)struct afs_server *afs_find_server (struct afs_net *net,const struct sockaddr_rxrpc *srx) { -const struct sockaddr_in6 *a = &srx->transport.sin6, *b;const struct afs_addr_list *alist;struct afs_server *server =NULL ;unsigned int i; -bool ipv6 = true;int seq =0 , diff; -if (srx->transport.sin6.sin6_addr.s6_addr32[0 ] ==0 || - srx->transport.sin6.sin6_addr.s6_addr32[1 ] ==0 || - srx->transport.sin6.sin6_addr.s6_addr32[2 ] ==htonl (0xffff )) - ipv6 = false; -rcu_read_lock (); do {
@@ -54,7 +47,8 @@ struct afs_server *afs_find_server(struct afs_net *net, server =NULL ;read_seqbegin_or_lock (&net->fs_addr_lock, &seq); -if (ipv6) { +if (srx->transport.family ==AF_INET6 ) { +const struct sockaddr_in6 *a = &srx->transport.sin6, *b;hlist_for_each_entry_rcu (server, &net->fs_addresses6, addr6_link) { alist =rcu_dereference (server->addresses);for (i = alist->nr_ipv4; i < alist->nr_addrs; i++) {
@@ -70,15 +64,16 @@ struct afs_server *afs_find_server(struct afs_net *net, } } }else { +const struct sockaddr_in *a = &srx->transport.sin, *b;hlist_for_each_entry_rcu (server, &net->fs_addresses4, addr4_link) { alist =rcu_dereference (server->addresses);for (i =0 ; i < alist->nr_ipv4; i++) { - b = &alist->addrs[i].transport.sin6; - diff = ((u16 __force )a->sin6_port - - (u16 __force )b->sin6_port); + b = &alist->addrs[i].transport.sin; + diff = ((u16 __force )a->sin_port - + (u16 __force )b->sin_port);if (diff ==0 ) - diff = ((u32 __force )a->sin6_addr.s6_addr32[3 ] - - (u32 __force )b->sin6_addr.s6_addr32[3 ]); + diff = ((u32 __force )a->sin_addr.s_addr - + (u32 __force )b->sin_addr.s_addr);if (diff ==0 ) goto found; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 11/34 afs: Fix SELinux setting security label on /afs
In reply to Sasha LevinFrom: David Howells <[email protected]>
[ Upstream commit bcbccaf2edcf1b76f73f890e968babef446151a4 ]
Make the AFS dynamic root superblock R/W so that SELinux can set the security label on it. Without this, upgrades to, say, the Fedora filesystem-afs RPM fail if afs is mounted on it because the SELinux label can't be (re-)applied.
It might be better to make it possible to bypass the R/O check for LSM label application through setxattr.
--- fs/afs/super.c | 1 - 1 file changed, 1 deletion(-)
fs/afs/super.c +0 -1
@@ -404,7 +404,6 @@ static int afs_fill_super(struct super_block *sb,/* allocate the root inode and dentry */ if (as->dyn_root) { inode =afs_iget_pseudo_dir (sb, true); - sb->s_flags |=SB_RDONLY ; }else {sprintf (sb->s_id,"%u" , as->volume->vid);afs_activate_volume (as->volume);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 12/34 RDMA/cma: add missed unregister_pernet_subsys in init failure
In reply to Sasha LevinFrom: Chuhong Yuan <[email protected]>
[ Upstream commit 44a7b6759000ac51b92715579a7bba9e3f9245c2 ]
The driver forgets to call unregister_pernet_subsys() in the error path of cma_init().
Add the missed call to fix it.
--- drivers/infiniband/core/cma.c | 1 + 1 file changed, 1 insertion(+)
drivers/infiniband/core/cma.c +1 -0
@@ -4658,6 +4658,7 @@ static int __init cma_init(void) err:unregister_netdevice_notifier (&cma_nb);ib_sa_unregister_client (&sa_client); +unregister_pernet_subsys (&cma_pernet_operations); err_wq:destroy_workqueue (cma_wq);return ret;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 13/34 rxe: correctly calculate iCRC for unaligned payloads
In reply to Sasha LevinFrom: Steve Wise <[email protected]>
[ Upstream commit 2030abddec6884aaf5892f5724c48fc340e6826f ]
If RoCE PDUs being sent or received contain pad bytes, then the iCRC is miscalculated, resulting in PDUs being emitted by RXE with an incorrect iCRC, as well as ingress PDUs being dropped due to erroneously detecting a bad iCRC in the PDU. The fix is to include the pad bytes, if any, in iCRC computations.
Note: This bug has caused broken on-the-wire compatibility with actual hardware RoCE devices since the soft-RoCE driver was first put into the mainstream kernel. Fixing it will create an incompatibility with the original soft-RoCE devices, but is necessary to be compatible with real hardware devices.
--- drivers/infiniband/sw/rxe/rxe_recv.c | 2 +- drivers/infiniband/sw/rxe/rxe_req.c | 6 ++++++ drivers/infiniband/sw/rxe/rxe_resp.c | 7 +++++++ 3 files changed, 14 insertions(+), 1 deletion(-)
drivers/infiniband/sw/rxe/rxe_recv.c +1 -1
@@ -391,7 +391,7 @@ void rxe_rcv(struct sk_buff *skb) calc_icrc =rxe_icrc_hdr (pkt, skb); calc_icrc =rxe_crc32 (rxe, calc_icrc, (u8 *)payload_addr (pkt), -payload_size (pkt)); +payload_size (pkt) +bth_pad (pkt)); calc_icrc = (__force u32 )cpu_to_be32 (~calc_icrc);if (unlikely (calc_icrc != pack_icrc)) {if (skb->protocol ==htons (ETH_P_IPV6 ))
drivers/infiniband/sw/rxe/rxe_req.c +6 -0
@@ -500,6 +500,12 @@ static int fill_packet(struct rxe_qp *qp, struct rxe_send_wqe *wqe,if (err)return err; } +if (bth_pad (pkt)) { +u8 *pad =payload_addr (pkt) + paylen; + +memset (pad,0 ,bth_pad (pkt)); + crc =rxe_crc32 (rxe, crc, pad,bth_pad (pkt)); + } } p =payload_addr (pkt) + paylen +bth_pad (pkt);
drivers/infiniband/sw/rxe/rxe_resp.c +7 -0
@@ -737,6 +737,13 @@ static enum resp_states read_reply(struct rxe_qp *qp,if (err)pr_err ("Failed copying memory\n" ); +if (bth_pad (&ack_pkt)) { +struct rxe_dev *rxe =to_rdev (qp->ibqp.device); +u8 *pad =payload_addr (&ack_pkt) + payload; + +memset (pad,0 ,bth_pad (&ack_pkt)); + icrc =rxe_crc32 (rxe, icrc, pad,bth_pad (&ack_pkt)); + } p =payload_addr (&ack_pkt) + payload +bth_pad (&ack_pkt); *p = ~icrc;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 14/34 scsi: lpfc: Fix memory leak on lpfc_bsg_write_ebuf_set func
In reply to Sasha LevinFrom: Bo Wu <[email protected]>
[ Upstream commit 9a1b0b9a6dab452fb0e39fe96880c4faf3878369 ]
When phba->mbox_ext_buf_ctx.seqNum != phba->mbox_ext_buf_ctx.numBuf, dd_data should be freed before return SLI_CONFIG_HANDLED.
When lpfc_sli_issue_mbox func return fails, pmboxq should be also freed in job_error tag.
--- drivers/scsi/lpfc/lpfc_bsg.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
drivers/scsi/lpfc/lpfc_bsg.c +9 -6
@@ -4419,12 +4419,6 @@ lpfc_bsg_write_ebuf_set(struct lpfc_hba *phba, struct bsg_job *job, phba->mbox_ext_buf_ctx.seqNum++; nemb_tp = phba->mbox_ext_buf_ctx.nembType; - dd_data =kmalloc (sizeof (struct bsg_job_data ),GFP_KERNEL ); -if (!dd_data) { - rc = -ENOMEM ; - goto job_error; - } - pbuf = (uint8_t *)dmabuf->virt; size = job->request_payload.payload_len; sg_copy_to_buffer(job->request_payload.sg_list,
@@ -4461,6 +4455,13 @@ lpfc_bsg_write_ebuf_set(struct lpfc_hba *phba, struct bsg_job *job,"2968 SLI_CONFIG ext-buffer wr all %d " "ebuffers received\n" , phba->mbox_ext_buf_ctx.numBuf); + + dd_data =kmalloc (sizeof (struct bsg_job_data ),GFP_KERNEL ); +if (!dd_data) { + rc = -ENOMEM ; + goto job_error; + } +/* mailbox command structure for base driver */ pmboxq =mempool_alloc (phba->mbox_mem_pool,GFP_KERNEL );if (!pmboxq) {
@@ -4509,6 +4510,8 @@ lpfc_bsg_write_ebuf_set(struct lpfc_hba *phba, struct bsg_job *job,return SLI_CONFIG_HANDLED ; job_error: +if (pmboxq) +mempool_free (pmboxq, phba->mbox_mem_pool);lpfc_bsg_dma_page_free (phba, dmabuf);kfree (dd_data);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 15/34 scsi: qla2xxx: Drop superfluous INIT_WORK of del_work
In reply to Sasha LevinFrom: Roman Bolshakov <[email protected]>
[ Upstream commit 600954e6f2df695434887dfc6a99a098859990cf ]
del_work is already initialized inside qla2x00_alloc_fcport, there's no need to overwrite it. Indeed, it might prevent complete traversal of workqueue list.
--- drivers/scsi/qla2xxx/qla_target.c | 1 - 1 file changed, 1 deletion(-)
drivers/scsi/qla2xxx/qla_target.c +0 -1
@@ -1261,7 +1261,6 @@ void qlt_schedule_sess_for_deletion(struct fc_port *sess)"Scheduling sess %p for deletion %8phC\n" , sess, sess->port_name); -INIT_WORK (&sess->del_work, qla24xx_delete_sess_fn);WARN_ON (!queue_work (sess->vha->hw->wq, &sess->del_work)); }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 16/34 scsi: qla2xxx: Don't call qlt_async_event twice
In reply to Sasha LevinFrom: Roman Bolshakov <[email protected]>
[ Upstream commit 2c2f4bed9b6299e6430a65a29b5d27b8763fdf25 ]
MBA_PORT_UPDATE generates duplicate log lines in target mode because qlt_async_event is called twice. Drop the calls within the case as the function will be called right after the switch statement.
--- drivers/scsi/qla2xxx/qla_isr.c | 4 ---- 1 file changed, 4 deletions(-)
drivers/scsi/qla2xxx/qla_isr.c +0 -4
@@ -1049,8 +1049,6 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb)ql_dbg (ql_dbg_async, vha,0x5011 ,"Asynchronous PORT UPDATE ignored %04x/%04x/%04x.\n" , mb[1 ], mb[2 ], mb[3 ]); - -qlt_async_event (mb[0 ], vha, mb);break ; }
@@ -1067,8 +1065,6 @@ qla2x00_async_event(scsi_qla_host_t *vha, struct rsp_que *rsp, uint16_t *mb)set_bit (LOOP_RESYNC_NEEDED , &vha->dpc_flags);set_bit (LOCAL_LOOP_UPDATE , &vha->dpc_flags);set_bit (VP_CONFIG_OK , &vha->vp_flags); - -qlt_async_event (mb[0 ], vha, mb);break ;case MBA_RSCN_UPDATE :/* State Change Registration */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 17/34 scsi: qla2xxx: Fix PLOGI payload and ELS IOCB dump length
In reply to Sasha LevinFrom: Roman Bolshakov <[email protected]>
[ Upstream commit 0334cdea1fba36fad8bdf9516f267ce01de625f7 ]
The size of the buffer is hardcoded as 0x70 or 112 bytes, while the size of ELS IOCB is 0x40 and the size of PLOGI payload returned by Get Parameters command is 0x74.
--- drivers/scsi/qla2xxx/qla_iocb.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
drivers/scsi/qla2xxx/qla_iocb.c +4 -2
@@ -2537,7 +2537,8 @@ qla24xx_els_logo_iocb(srb_t *sp, struct els_entry_24xx *els_iocb)ql_dbg (ql_dbg_io + ql_dbg_buffer, vha,0x3073 ,"PLOGI ELS IOCB:\n" );ql_dump_buffer (ql_log_info, vha,0x0109 , - (uint8_t *)els_iocb,0x70 ); + (uint8_t *)els_iocb, +sizeof (*els_iocb)); }else { els_iocb->tx_byte_count =sizeof (struct els_logo_payload ); els_iocb->tx_address[0] =
@@ -2703,7 +2704,8 @@ qla24xx_els_dcmd2_iocb(scsi_qla_host_t *vha, int els_opcode,ql_dbg (ql_dbg_disc + ql_dbg_buffer, vha,0x3073 ,"PLOGI buffer:\n" );ql_dump_buffer (ql_dbg_disc + ql_dbg_buffer, vha,0x0109 , - (uint8_t *)elsio->u.els_plogi.els_plogi_pyld,0x70 ); + (uint8_t *)elsio->u.els_plogi.els_plogi_pyld, +sizeof (*elsio->u.els_plogi.els_plogi_pyld)); rval =qla2x00_start_sp (sp);if (rval !=QLA_SUCCESS ) {
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 18/34 scsi: qla2xxx: Configure local loop for N2N target
In reply to Sasha LevinFrom: Roman Bolshakov <[email protected]>
[ Upstream commit fd1de5830a5abaf444cc4312871e02c41e24fdc1 ]
qla2x00_configure_local_loop initializes PLOGI payload for PLOGI ELS using Get Parameters mailbox command.
In the case when the driver is running in target mode, the topology is N2N and the target port has higher WWPN, LOCAL_LOOP_UPDATE bit is cleared too early and PLOGI payload is not initialized by the Get Parameters command. That causes a failure of ELS IOCB carrying the PLOGI with 0x15 aka Data Underrun error.
LOCAL_LOOP_UPDATE has to be set to initialize PLOGI payload.
--- drivers/scsi/qla2xxx/qla_init.c | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-)
drivers/scsi/qla2xxx/qla_init.c +2 -8
@@ -4814,14 +4814,8 @@ qla2x00_configure_loop(scsi_qla_host_t *vha)set_bit (RSCN_UPDATE , &flags);clear_bit (LOCAL_LOOP_UPDATE , &flags); - }else if (ha->current_topology ==ISP_CFG_N ) { -clear_bit (RSCN_UPDATE , &flags); -if (qla_tgt_mode_enabled (vha)) { -/* allow the other side to start the login */ -clear_bit (LOCAL_LOOP_UPDATE , &flags); -set_bit (RELOGIN_NEEDED , &vha->dpc_flags); - } - }else if (ha->current_topology ==ISP_CFG_NL ) { + }else if (ha->current_topology ==ISP_CFG_NL || + ha->current_topology ==ISP_CFG_N ) {clear_bit (RSCN_UPDATE , &flags);set_bit (LOCAL_LOOP_UPDATE , &flags); } else if (!vha->flags.online ||
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 19/34 scsi: qla2xxx: Send Notify ACK after N2N PLOGI
In reply to Sasha LevinFrom: Roman Bolshakov <[email protected]>
[ Upstream commit 5e6b01d84b9d20bcd77fc7c4733a2a4149bf220a ]
qlt_handle_login schedules session for deletion even if a login is in progress. That causes login bouncing, i.e. a few logins are made before it settles down.
Complete the first login by sending Notify Acknowledge IOCB via qlt_plogi_ack_unref if the session is pending login completion.
--- drivers/scsi/qla2xxx/qla_target.c | 1 + 1 file changed, 1 insertion(+)
drivers/scsi/qla2xxx/qla_target.c +1 -0
@@ -4779,6 +4779,7 @@ static int qlt_handle_login(struct scsi_qla_host *vha,switch (sess->disc_state) {case DSC_DELETED : +case DSC_LOGIN_PEND :qlt_plogi_ack_unref (vha, pla);break ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 20/34 scsi: qla2xxx: Ignore PORT UPDATE after N2N PLOGI
In reply to Sasha LevinFrom: Roman Bolshakov <[email protected]>
[ Upstream commit af22f0c7b052c5c203207f1e5ebd6aa65f87c538 ]
PORT UPDATE asynchronous event is generated on the host that issues PLOGI ELS (in the case of higher WWPN). In that case, the event shouldn't be handled as it sets unwanted DPC flags (i.e. LOOP_RESYNC_NEEDED) that trigger link flap.
Ignore the event if the host has higher WWPN, but handle otherwise.
--- drivers/scsi/qla2xxx/qla_mbx.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/scsi/qla2xxx/qla_mbx.c +2 -1
@@ -3871,6 +3871,7 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *vha, vha->d_id.b24 =0 ; vha->d_id.b.al_pa =1 ; ha->flags.n2n_bigger =1 ; + ha->flags.n2n_ae =0 ; id.b.al_pa =2 ; ql_dbg(ql_dbg_async, vha, 0x5075,
@@ -3881,6 +3882,7 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *vha,"Format 1: Remote login - Waiting for WWPN %8phC.\n" , rptid_entry->u.f1.port_name); ha->flags.n2n_bigger =0 ; + ha->flags.n2n_ae =1 ; } qla24xx_post_newsess_work(vha, &id, rptid_entry->u.f1.port_name,
@@ -3892,7 +3894,6 @@ qla24xx_report_id_acquisition(scsi_qla_host_t *vha,/* if our portname is higher then initiate N2N login */ set_bit (N2N_LOGIN_NEEDED , &vha->dpc_flags); - ha->flags.n2n_ae =1 ;return ;break ;case TOPO_FL :
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 21/34 scsi: iscsi: qla4xxx: fix double free in probe
In reply to Sasha LevinFrom: Dan Carpenter <[email protected]>
[ Upstream commit fee92f25777789d73e1936b91472e9c4644457c8 ]
On this error path we call qla4xxx_mem_free() and then the caller also calls qla4xxx_free_adapter() which calls qla4xxx_mem_free(). It leads to a couple double frees:
drivers/scsi/qla4xxx/ql4_os.c:8856 qla4xxx_probe_adapter() warn: 'ha->chap_dma_pool' double freed drivers/scsi/qla4xxx/ql4_os.c:8856 qla4xxx_probe_adapter() warn: 'ha->fw_ddb_dma_pool' double freed
--- drivers/scsi/qla4xxx/ql4_os.c | 1 - 1 file changed, 1 deletion(-)
drivers/scsi/qla4xxx/ql4_os.c +0 -1
@@ -4280,7 +4280,6 @@ static int qla4xxx_mem_alloc(struct scsi_qla_host *ha)return QLA_SUCCESS ; mem_alloc_error_exit: -qla4xxx_mem_free (ha);return QLA_ERROR ; }
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 22/34 scsi: libsas: stop discovering if oob mode is disconnected
In reply to Sasha LevinFrom: Jason Yan <[email protected]>
[ Upstream commit f70267f379b5e5e11bdc5d72a56bf17e5feed01f ]
The discovering of sas port is driven by workqueue in libsas. When libsas is processing port events or phy events in workqueue, new events may rise up and change the state of some structures such as asd_sas_phy. This may cause some problems such as follows:
==>thread 1 ==>thread 2
==>phy up
==>phy_up_v3_hw()
==>oob_mode = SATA_OOB_MODE;
==>phy down quickly
==>hisi_sas_phy_down()
==>sas_ha->notify_phy_event()
==>sas_phy_disconnected()
==>oob_mode = OOB_NOT_CONNECTED
==>workqueue wakeup
==>sas_form_port()
==>sas_discover_domain()
==>sas_get_port_device()
==>oob_mode is OOB_NOT_CONNECTED and device
is wrongly taken as expanderThis at last lead to the panic when libsas trying to issue a command to discover the device.
[183047.614035] Unable to handle kernel NULL pointer dereference at virtual address 0000000000000058 [183047.622896] Mem abort info: [183047.625762] ESR = 0x96000004 [183047.628893] Exception class = DABT (current EL), IL = 32 bits [183047.634888] SET = 0, FnV = 0 [183047.638015] EA = 0, S1PTW = 0 [183047.641232] Data abort info: [183047.644189] ISV = 0, ISS = 0x00000004 [183047.648100] CM = 0, WnR = 0 [183047.651145] user pgtable: 4k pages, 48-bit VAs, pgdp = 00000000b7df67be [183047.657834] [0000000000000058] pgd=0000000000000000 [183047.662789] Internal error: Oops: 96000004 [#1] SMP [183047.667740] Process kworker/u16:2 (pid: 31291, stack limit = 0x00000000417c4974) [183047.675208] CPU: 0 PID: 3291 Comm: kworker/u16:2 Tainted: G W OE 4.19.36-vhulk1907.1.0.h410.eulerosv2r8.aarch64 #1 [183047.687015] Hardware name: N/A N/A/Kunpeng Desktop Board D920S10, BIOS 0.15 10/22/2019 [183047.695007] Workqueue: 0000:74:02.0_disco_q sas_discover_domain [183047.700999] pstate: 20c00009 (nzCv daif +PAN +UAO) [183047.705864] pc : prep_ata_v3_hw+0xf8/0x230 [hisi_sas_v3_hw] [183047.711510] lr : prep_ata_v3_hw+0xb0/0x230 [hisi_sas_v3_hw] [183047.717153] sp : ffff00000f28ba60 [183047.720541] x29: ffff00000f28ba60 x28: ffff8026852d7228 [183047.725925] x27: ffff8027dba3e0a8 x26: ffff8027c05fc200 [183047.731310] x25: 0000000000000000 x24: ffff8026bafa8dc0 [183047.736695] x23: ffff8027c05fc218 x22: ffff8026852d7228 [183047.742079] x21: ffff80007c2f2940 x20: ffff8027c05fc200 [183047.747464] x19: 0000000000f80800 x18: 0000000000000010 [183047.752848] x17: 0000000000000000 x16: 0000000000000000 [183047.758232] x15: ffff000089a5a4ff x14: 0000000000000005 [183047.763617] x13: ffff000009a5a50e x12: ffff8026bafa1e20 [183047.769001] x11: ffff0000087453b8 x10: ffff00000f28b870 [183047.774385] x9 : 0000000000000000 x8 : ffff80007e58f9b0 [183047.779770] x7 : 0000000000000000 x6 : 000000000000003f [183047.785154] x5 : 0000000000000040 x4 : ffffffffffffffe0 [183047.790538] x3 : 00000000000000f8 x2 : 0000000002000007 [183047.795922] x1 : 0000000000000008 x0 : 0000000000000000 [183047.801307] Call trace: [183047.803827] prep_ata_v3_hw+0xf8/0x230 [hisi_sas_v3_hw] [183047.809127] hisi_sas_task_prep+0x750/0x888 [hisi_sas_main] [183047.814773] hisi_sas_task_exec.isra.7+0x88/0x1f0 [hisi_sas_main] [183047.820939] hisi_sas_queue_command+0x28/0x38 [hisi_sas_main] [183047.826757] smp_execute_task_sg+0xec/0x218 [183047.831013] smp_execute_task+0x74/0xa0 [183047.834921] sas_discover_expander.part.7+0x9c/0x5f8 [183047.839959] sas_discover_root_expander+0x90/0x160 [183047.844822] sas_discover_domain+0x1b8/0x1e8 [183047.849164] process_one_work+0x1b4/0x3f8 [183047.853246] worker_thread+0x54/0x470 [183047.856981] kthread+0x134/0x138 [183047.860283] ret_from_fork+0x10/0x18 [183047.863931] Code: f9407a80 528000e2 39409281 72a04002 (b9405800) [183047.870097] kernel fault(0x1) notification starting on CPU 0 [183047.875828] kernel fault(0x1) notification finished on CPU 0 [183047.881559] Modules linked in: unibsp(OE) hns3(OE) hclge(OE) hnae3(OE) mem_drv(OE) hisi_sas_v3_hw(OE) hisi_sas_main(OE) [183047.892418] ---[ end trace 4cc26083fc11b783 ]--- [183047.897107] Kernel panic - not syncing: Fatal exception [183047.902403] kernel fault(0x5) notification starting on CPU 0 [183047.908134] kernel fault(0x5) notification finished on CPU 0 [183047.913865] SMP: stopping secondary CPUs [183047.917861] Kernel Offset: disabled [183047.921422] CPU features: 0x2,a2a00a38 [183047.925243] Memory Limit: none [183047.928372] kernel reboot(0x2) notification starting on CPU 0 [183047.934190] kernel reboot(0x2) notification finished on CPU 0 [183047.940008] ---[ end Kernel panic - not syncing: Fatal exception
]---
--- drivers/scsi/libsas/sas_discover.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-)
drivers/scsi/libsas/sas_discover.c +10 -1
@@ -97,12 +97,21 @@ static int sas_get_port_device(struct asd_sas_port *port)else dev->dev_type =SAS_SATA_DEV ; dev->tproto =SAS_PROTOCOL_SATA ; - }else { + }else if (port->oob_mode ==SAS_OOB_MODE ) {struct sas_identify_frame *id = (struct sas_identify_frame *) dev->frame_rcvd; dev->dev_type = id->dev_type; dev->iproto = id->initiator_bits; dev->tproto = id->target_bits; + }else { +/* If the oob mode is OOB_NOT_CONNECTED, the port is +* disconnected due to race with PHY down. We cannot +* continue to discover this port +*/ +sas_put_device (dev); +pr_warn ("Port %016llx is disconnected when discovering\n" , +SAS_ADDR (port->attached_sas_addr)); +return -ENODEV ; }sas_init_dev (dev);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 23/34 drm/nouveau: Move the declaration of struct nouveau_conn_atom up a bit
In reply to Sasha LevinFrom: Hans de Goede <[email protected]>
[ Upstream commit 37a68eab4cd92b507c9e8afd760fdc18e4fecac6 ]
Place the declaration of struct nouveau_conn_atom above that of struct nouveau_connector. This commit makes no changes to the moved block what so ever, it just moves it up a bit.
This is a preparation patch to fix some issues with connector handling on pre nv50 displays (which do not use atomic modesetting).
--- drivers/gpu/drm/nouveau/nouveau_connector.h | 110 ++++++++++---------- 1 file changed, 55 insertions(+), 55 deletions(-)
drivers/gpu/drm/nouveau/nouveau_connector.h +55 -55
@@ -29,6 +29,7 @@#include <nvif/notify.h> +#include <drm/drm_crtc.h> #include <drm/drm_edid.h> #include <drm/drm_encoder.h> #include <drm/drm_dp_helper.h>
@@ -37,6 +38,60 @@struct nvkm_i2c_port ; +#define nouveau_conn_atom (p) \ + container_of((p), struct nouveau_conn_atom, state) + +struct nouveau_conn_atom { +struct drm_connector_state state; + +struct { +/* The enum values specifically defined here match nv50/gf119 +* hw values, and the code relies on this. +*/ +enum { +DITHERING_MODE_OFF =0x00 , +DITHERING_MODE_ON =0x01 , +DITHERING_MODE_DYNAMIC2X2 =0x10 |DITHERING_MODE_ON , +DITHERING_MODE_STATIC2X2 =0x18 |DITHERING_MODE_ON , +DITHERING_MODE_TEMPORAL =0x20 |DITHERING_MODE_ON , +DITHERING_MODE_AUTO + } mode; +enum { +DITHERING_DEPTH_6BPC =0x00 , +DITHERING_DEPTH_8BPC =0x02 , +DITHERING_DEPTH_AUTO + } depth; + } dither; + +struct { +int mode;/* DRM_MODE_SCALE_* */ +struct { +enum { +UNDERSCAN_OFF , +UNDERSCAN_ON , +UNDERSCAN_AUTO , + } mode; +u32 hborder; +u32 vborder; + } underscan; +bool full; + } scaler; + +struct { +int color_vibrance; +int vibrant_hue; + } procamp; + +union { +struct { +bool dither:1 ; +bool scaler:1 ; +bool procamp:1 ; + }; +u8 mask; + } set; +}; +struct nouveau_connector {struct drm_connector base;enum dcb_connector_type type;
@@ -111,61 +166,6 @@ extern int nouveau_ignorelid;extern int nouveau_duallink;extern int nouveau_hdmimhz; -#include <drm/drm_crtc.h> -#define nouveau_conn_atom (p) \ - container_of((p), struct nouveau_conn_atom, state) - -struct nouveau_conn_atom { -struct drm_connector_state state; - -struct { -/* The enum values specifically defined here match nv50/gf119 -* hw values, and the code relies on this. -*/ -enum { -DITHERING_MODE_OFF =0x00 , -DITHERING_MODE_ON =0x01 , -DITHERING_MODE_DYNAMIC2X2 =0x10 |DITHERING_MODE_ON , -DITHERING_MODE_STATIC2X2 =0x18 |DITHERING_MODE_ON , -DITHERING_MODE_TEMPORAL =0x20 |DITHERING_MODE_ON , -DITHERING_MODE_AUTO - } mode; -enum { -DITHERING_DEPTH_6BPC =0x00 , -DITHERING_DEPTH_8BPC =0x02 , -DITHERING_DEPTH_AUTO - } depth; - } dither; - -struct { -int mode;/* DRM_MODE_SCALE_* */ -struct { -enum { -UNDERSCAN_OFF , -UNDERSCAN_ON , -UNDERSCAN_AUTO , - } mode; -u32 hborder; -u32 vborder; - } underscan; -bool full; - } scaler; - -struct { -int color_vibrance; -int vibrant_hue; - } procamp; - -union { -struct { -bool dither:1 ; -bool scaler:1 ; -bool procamp:1 ; - }; -u8 mask; - } set; -}; -void nouveau_conn_attach_properties (struct drm_connector *);void nouveau_conn_reset (struct drm_connector *); struct drm_connector_state *
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 24/34 usb: gadget: fix wrong endpoint desc
In reply to Sasha LevinFrom: EJ Hsu <[email protected]>
[ Upstream commit e5b5da96da50ef30abb39cb9f694e99366404d24 ]
Gadget driver should always use config_ep_by_speed() to initialize usb_ep struct according to usb device's operating speed. Otherwise, usb_ep struct may be wrong if usb devcie's operating speed is changed.
The key point in this patch is that we want to make sure the desc pointer in usb_ep struct will be set to NULL when gadget is disconnected. This will force it to call config_ep_by_speed() to correctly initialize usb_ep struct based on the new operating speed when gadget is re-connected later.
--- drivers/usb/gadget/function/f_ecm.c | 6 +++++- drivers/usb/gadget/function/f_rndis.c | 1 + 2 files changed, 6 insertions(+), 1 deletion(-)
drivers/usb/gadget/function/f_ecm.c +5 -1
@@ -621,8 +621,12 @@ static void ecm_disable(struct usb_function *f)DBG (cdev,"ecm deactivated\n" ); -if (ecm->port.in_ep->enabled) +if (ecm->port.in_ep->enabled) {gether_disconnect (&ecm->port); + }else { + ecm->port.in_ep->desc =NULL ; + ecm->port.out_ep->desc =NULL ; + }usb_ep_disable (ecm->notify); ecm->notify->desc =NULL ;
drivers/usb/gadget/function/f_rndis.c +1 -0
@@ -618,6 +618,7 @@ static void rndis_disable(struct usb_function *f)gether_disconnect (&rndis->port);usb_ep_disable (rndis->notify); + rndis->notify->desc =NULL ; }/*-------------------------------------------------------------------------*/
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 25/34 net: make socket read/write_iter() honor IOCB_NOWAIT
In reply to Sasha LevinFrom: Jens Axboe <[email protected]>
[ Upstream commit ebfcd8955c0b52eb793bcbc9e71140e3d0cdb228 ]
The socket read/write helpers only look at the file O_NONBLOCK. not the iocb IOCB_NOWAIT flag. This breaks users like preadv2/pwritev2 and io_uring that rely on not having the file itself marked nonblocking, but rather the iocb itself.
--- net/socket.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-)
net/socket.c +2 -2
@@ -867,7 +867,7 @@ static ssize_t sock_read_iter(struct kiocb *iocb, struct iov_iter *to) .msg_iocb = iocb};ssize_t res; -if (file->f_flags &O_NONBLOCK ) +if (file->f_flags &O_NONBLOCK || (iocb->ki_flags &IOCB_NOWAIT )) msg.msg_flags =MSG_DONTWAIT ;if (iocb->ki_pos !=0 )
@@ -892,7 +892,7 @@ static ssize_t sock_write_iter(struct kiocb *iocb, struct iov_iter *from)if (iocb->ki_pos !=0 )return -ESPIPE ; -if (file->f_flags &O_NONBLOCK ) +if (file->f_flags &O_NONBLOCK || (iocb->ki_flags &IOCB_NOWAIT )) msg.msg_flags =MSG_DONTWAIT ;if (sock->type ==SOCK_SEQPACKET )
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 26/34 afs: Fix creation calls in the dynamic root to fail with EOPNOTSUPP
In reply to Sasha LevinFrom: David Howells <[email protected]>
[ Upstream commit 1da4bd9f9d187f53618890d7b66b9628bbec3c70 ]
Fix the lookup method on the dynamic root directory such that creation calls, such as mkdir, open(O_CREAT), symlink, etc. fail with EOPNOTSUPP rather than failing with some odd error (such as EEXIST).
lookup() itself tries to create automount directories when it is invoked. These are cached locally in RAM and not committed to storage.
--- fs/afs/dynroot.c | 3 +++ 1 file changed, 3 insertions(+)
fs/afs/dynroot.c +3 -0
@@ -145,6 +145,9 @@ static struct dentry *afs_dynroot_lookup(struct inode *dir, struct dentry *dentr ASSERTCMP(d_inode(dentry), ==, NULL); +if (flags &LOOKUP_CREATE ) +return ERR_PTR (-EOPNOTSUPP ); +if (dentry->d_name.len >=AFSNAMEMAX ) {_leave (" = -ENAMETOOLONG" );return ERR_PTR (-ENAMETOOLONG );
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 27/34 md: raid1: check rdev before reference in raid1_sync_request func
In reply to Sasha LevinFrom: Zhiqiang Liu <[email protected]>
[ Upstream commit 028288df635f5a9addd48ac4677b720192747944 ]
In raid1_sync_request func, rdev should be checked before reference.
--- drivers/md/raid1.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/md/raid1.c +1 -1
@@ -2756,7 +2756,7 @@ static sector_t raid1_sync_request(struct mddev *mddev, sector_t sector_nr, write_targets++; } } -if (bio->bi_end_io) { +if (rdev && bio->bi_end_io) {atomic_inc (&rdev->nr_pending); bio->bi_iter.bi_sector = sector_nr + rdev->data_offset;bio_set_dev (bio, rdev->bdev);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 28/34 s390/cpum_sf: Adjust sampling interval to avoid hitting sample limits
In reply to Sasha LevinFrom: Thomas Richter <[email protected]>
[ Upstream commit 39d4a501a9ef55c57b51e3ef07fc2aeed7f30b3b ]
Function perf_event_ever_overflow() and perf_event_account_interrupt() are called every time samples are processed by the interrupt handler. However function perf_event_account_interrupt() has checks to avoid being flooded with interrupts (more then 1000 samples are received per task_tick). Samples are then dropped and a PERF_RECORD_THROTTLED is added to the perf data. The perf subsystem limit calculation is:
maximum sample frequency := 100000 --> 1 samples per 10 us
task_tick = 10ms = 10000us --> 1000 samples per task_tickThe work flow is
measurement_alert() uses SDBT head and each SBDT points to 511
SDB pages, each with 126 sample entries. After processing 8 SBDs and for each valid sample calling:
perf_event_overflow()
perf_event_account_interrupts()
there is a considerable amount of samples being dropped, especially when the sample frequency is very high and near the 100000 limit.
To avoid the high amount of samples being dropped near the end of a task_tick time frame, increment the sampling interval in case of dropped events. The CPU Measurement sampling facility on the s390 supports only intervals, specifiing how many CPU cycles have to be executed before a sample is generated. Increase the interval when the samples being generated hit the task_tick limit.
--- arch/s390/kernel/perf_cpum_sf.c | 16 ++++++++++++++++ 1 file changed, 16 insertions(+)
arch/s390/kernel/perf_cpum_sf.c +16 -0
@@ -1260,6 +1260,22 @@ static void hw_perf_event_update(struct perf_event *event, int flush_all)if (sampl_overflow)OVERFLOW_REG (hwc) =DIV_ROUND_UP (OVERFLOW_REG (hwc) + sampl_overflow,1 + num_sdb); + +/* Perf_event_overflow() and perf_event_account_interrupt() limit +* the interrupt rate to an upper limit. Roughly 1000 samples per +* task tick. +* Hitting this limit results in a large number +* of throttled REF_REPORT_THROTTLE entries and the samples +* are dropped. +* Slightly increase the interval to avoid hitting this limit. +*/ +if (event_overflow) { +SAMPL_RATE (hwc) +=DIV_ROUND_UP (SAMPL_RATE (hwc),10 ); +debug_sprintf_event (sfdbg,1 ,"%s: rate adjustment %ld\n" , + __func__, +DIV_ROUND_UP (SAMPL_RATE (hwc),10 )); + } +if (sampl_overflow || event_overflow) debug_sprintf_event(sfdbg, 4, "hw_perf_event_update: " "overflow stats: sample=%llu event=%llu\n",
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 29/34 s390/cpum_sf: Avoid SBD overflow condition in irq handler
In reply to Sasha LevinFrom: Thomas Richter <[email protected]>
[ Upstream commit 0539ad0b22877225095d8adef0c376f52cc23834 ]
The s390 CPU Measurement sampling facility has an overflow condition which fires when all entries in a SBD are used.
The measurement alert interrupt is triggered and reads out all samples in this SDB. It then tests the successor SDB, if this SBD is not full, the interrupt handler does not read any samples at all from this SDB The design waits for the hardware to fill this SBD and then trigger another meassurement alert interrupt.
This scheme works nicely until
an perf_event_overflow() function call discards the sample due to a too high sampling rate.
The interrupt handler has logic to read out a partially filled SDB when the perf event overflow condition in linux common code is met. This causes the CPUM sampling measurement hardware and the PMU device driver to operate on the same SBD's trailer entry. This should not happen.
This can be seen here using this trace:
cpumsf_pmu_add: tear:0xb5286000
hw_perf_event_update: sdbt 0xb5286000 full 1 over 0 flush_all:0
hw_perf_event_update: sdbt 0xb5286008 full 0 over 0 flush_all:0
above shows 1. interrupt
hw_perf_event_update: sdbt 0xb5286008 full 1 over 0 flush_all:0
hw_perf_event_update: sdbt 0xb5286008 full 0 over 0 flush_all:0
above shows 2. interrupt
... this goes on fine until...
hw_perf_event_update: sdbt 0xb5286068 full 1 over 0 flush_all:0
perf_push_sample1: overflow
one or more samples read from the IRQ handler are rejected by perf_event_overflow() and the IRQ handler advances to the next SDB and modifies the trailer entry of a partially filled SDB.
hw_perf_event_update: sdbt 0xb5286070 full 0 over 0 flush_all:1
timestamp: 14:32:52.519953
Next time the IRQ handler is called for this SDB the trailer entry shows an overflow count of 19 missed entries.
hw_perf_event_update: sdbt 0xb5286070 full 1 over 19 flush_all:1
timestamp: 14:32:52.970058
Remove access to a follow on SDB when event overflow happened.
--- arch/s390/kernel/perf_cpum_sf.c | 6 ------ 1 file changed, 6 deletions(-)
arch/s390/kernel/perf_cpum_sf.c +0 -6
@@ -1248,12 +1248,6 @@ static void hw_perf_event_update(struct perf_event *event, int flush_all)*/ if (flush_all && done)break ; - -/* If an event overflow happened, discard samples by -* processing any remaining sample-data-blocks. -*/ -if (event_overflow) - flush_all =1 ; }/* Account sample overflows in the event hardware structure */
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 30/34 IB/mlx4: Follow mirror sequence of device add during device removal
In reply to Sasha LevinFrom: Parav Pandit <[email protected]>
[ Upstream commit 89f988d93c62384758b19323c886db917a80c371 ]
Current code device add sequence is:
ib_register_device()ib_mad_init()init_sriov_init()register_netdev_notifier()
Therefore, the remove sequence should be,
unregister_netdev_notifier()close_sriov()mad_cleanup()ib_unregister_device()
However it is not above.
Hence, make do above remove sequence.
--- drivers/infiniband/hw/mlx4/main.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)
drivers/infiniband/hw/mlx4/main.c +5 -4
@@ -3069,16 +3069,17 @@ static void mlx4_ib_remove(struct mlx4_dev *dev, void *ibdev_ptr) ibdev->ib_active = false;flush_workqueue (wq); -mlx4_ib_close_sriov (ibdev); -mlx4_ib_mad_cleanup (ibdev); -ib_unregister_device (&ibdev->ib_dev); -mlx4_ib_diag_cleanup (ibdev);if (ibdev->iboe.nb.notifier_call) {if (unregister_netdevice_notifier (&ibdev->iboe.nb))pr_warn ("failure unregistering notifier\n" ); ibdev->iboe.nb.notifier_call =NULL ; } +mlx4_ib_close_sriov (ibdev); +mlx4_ib_mad_cleanup (ibdev); +ib_unregister_device (&ibdev->ib_dev); +mlx4_ib_diag_cleanup (ibdev); +mlx4_qp_release_range (dev, ibdev->steer_qpn_base, ibdev->steer_qpn_count);kfree (ibdev->ib_uc_qpns_bitmap);
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 31/34 IB/mlx5: Fix steering rule of drop and count
In reply to Sasha LevinFrom: Maor Gottlieb <[email protected]>
[ Upstream commit ed9085fed9d95d5921582e3c8474f3736c5d2782 ]
There are two flow rule destinations: QP and packet. While users are setting DROP packet rule, the QP should not be set as a destination.
--- drivers/infiniband/hw/mlx5/main.c | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-)
drivers/infiniband/hw/mlx5/main.c +6 -7
@@ -3286,10 +3286,6 @@ static struct mlx5_ib_flow_handler *_create_flow_rule(struct mlx5_ib_dev *dev, }INIT_LIST_HEAD (&handler->list); -if (dst) { -memcpy (&dest_arr[0 ], dst,sizeof (*dst)); - dest_num++; - }for (spec_index =0 ; spec_index < flow_attr->num_of_specs; spec_index++) { err = parse_flow_attr(dev->mdev, spec->match_criteria,
@@ -3303,6 +3299,11 @@ static struct mlx5_ib_flow_handler *_create_flow_rule(struct mlx5_ib_dev *dev, ib_flow += ((union ib_flow_spec *)ib_flow)->size; } +if (dst && !(flow_act.action &MLX5_FLOW_CONTEXT_ACTION_DROP )) { +memcpy (&dest_arr[0 ], dst,sizeof (*dst)); + dest_num++; + } +if (!flow_is_multicast_only (flow_attr))set_underlay_qp (dev, spec, underlay_qpn);
@@ -3340,10 +3341,8 @@ static struct mlx5_ib_flow_handler *_create_flow_rule(struct mlx5_ib_dev *dev, }if (flow_act.action &MLX5_FLOW_CONTEXT_ACTION_DROP ) { -if (!(flow_act.action &MLX5_FLOW_CONTEXT_ACTION_COUNT )) { +if (!dest_num) rule_dst =NULL ; - dest_num =0 ; - } }else {if (is_egress) flow_act.action |=MLX5_FLOW_CONTEXT_ACTION_ALLOW ;
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 32/34 xen-blkback: prevent premature module unload
In reply to Sasha LevinFrom: Paul Durrant <[email protected]>
[ Upstream commit fa2ac657f9783f0891b2935490afe9a7fd29d3fa ]
Objects allocated by xen_blkif_alloc come from the 'blkif_cache' kmem cache. This cache is destoyed when xen-blkif is unloaded so it is necessary to wait for the deferred free routine used for such objects to complete. This necessity was missed in commit 14855954f636 "xen-blkback:
allow module to be cleanly unloaded". This patch fixes the problem by taking/releasing extra module references in xen_blkif_alloc/free() respectively.
--- drivers/block/xen-blkback/xenbus.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
drivers/block/xen-blkback/xenbus.c +10 -0
@@ -179,6 +179,15 @@ static struct xen_blkif *xen_blkif_alloc(domid_t domid) blkif->domid = domid;atomic_set (&blkif->refcnt,1 );init_completion (&blkif->drain_complete); + +/* +* Because freeing back to the cache may be deferred, it is not +* safe to unload the module (and hence destroy the cache) until +* this has completed. To prevent premature unloading, take an +* extra module reference here and release only when the object +* has been freed back to the cache. +*/ +__module_get (THIS_MODULE );INIT_WORK (&blkif->free_work, xen_blkif_deferred_free);return blkif;
@@ -328,6 +337,7 @@ static void xen_blkif_free(struct xen_blkif *blkif)/* Make sure everything is drained before shutting down */ kmem_cache_free (xen_blkif_cachep, blkif); +module_put (THIS_MODULE ); }int __init xen_blkif_interface_init (void )
Signature · 1 line
2.20.1
Sasha Levin
maintainerPATCH 33/34 xen/balloon: fix ballooned page accounting without hotplug enabled
In reply to Sasha LevinFrom: Juergen Gross <[email protected]>
[ Upstream commit c673ec61ade89bf2f417960f986bc25671762efb ]
When CONFIG_XEN_BALLOON_MEMORY_HOTPLUG is not defined reserve_additional_memory() will set balloon_stats.target_pages to a wrong value in case there are still some ballooned pages allocated via alloc_xenballooned_pages().
This will result in balloon_process() no longer be triggered when ballooned pages are freed in batches.
--- drivers/xen/balloon.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)
drivers/xen/balloon.c +2 -1
@@ -395,7 +395,8 @@ static struct notifier_block xen_memory_nb = {#else static enum bp_state reserve_additional_memory (void ) { - balloon_stats.target_pages = balloon_stats.current_pages; + balloon_stats.target_pages = balloon_stats.current_pages + + balloon_stats.target_unpopulated;return BP_ECANCELED ; }#endif /* CONFIG_XEN_BALLOON_MEMORY_HOTPLUG */
Signature · 7 lines
2.20.1 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
Sasha Levin
maintainerPATCH 34/34 PM / hibernate: memory_bm_find_bit(): Tighten node optimisation
In reply to Sasha LevinFrom: Andy Whitcroft <[email protected]>
[ Upstream commit da6043fe85eb5ec621e34a92540735dcebbea134 ]
When looking for a bit by number we make use of the cached result from the preceding lookup to speed up operation. Firstly we check if the requested pfn is within the cached zone and if not lookup the new zone. We then check if the offset for that pfn falls within the existing cached node. This happens regardless of whether the node is within the zone we are now scanning. With certain memory layouts it is possible for this to false trigger creating a temporary alias for the pfn to a different bit. This leads the hibernation code to free memory which it was never allocated with the expected fallout.
Ensure the zone we are scanning matches the cached zone before considering the cached node.
Deep thanks go to Andrea for many, many, many hours of hacking and testing that went into cornering this bug.
--- kernel/power/snapshot.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-)
kernel/power/snapshot.c +8 -1
@@ -736,8 +736,15 @@ static int memory_bm_find_bit(struct memory_bitmap *bm, unsigned long pfn,* We have found the zone. Now walk the radix tree to find the leaf node * for our PFN. */ + +/* +* If the zone we wish to scan is the the current zone and the +* pfn falls into the current node then we do not need to walk +* the tree. +*/ node = bm->cur.node; -if (((pfn - zone->start_pfn) & ~BM_BLOCK_MASK ) == bm->cur.node_pfn) +if (zone == bm->cur.zone && + ((pfn - zone->start_pfn) & ~BM_BLOCK_MASK ) == bm->cur.node_pfn) goto node_found; node = zone->rtree;
Signature · 1 line
2.20.1