mirrors
/
linux-stable
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Revert "devcoredump: remove the useless gfp_t parameter in dev_coredumpv and dev_coredumpm" 

commit 38a523a294 upstream.

This reverts commit 77515ebaf0 as it
causes build problems in linux-next.  It needs to be reintroduced in a
way that can allow the api to evolve and not require a "flag day" to
catch all users.

Link: https://lore.kernel.org/r/20220623160723.7a44b573@canb.auug.org.au
Cc: Duoming Zhou <duoming@zju.edu.cn>
Cc: Brian Norris <briannorris@chromium.org>
Cc: Johannes Berg <johannes@sipsolutions.net>
Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2022-06-27 16:36:57 +02:00
parent 2d03f321a5
commit d729f0ee99
24 changed files with 50 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/base/devcoredump.c
View File

@ -173,13 +173,15 @@ static void devcd_freev(void *data)
* @dev: the struct device for the crashed device
* @data: vmalloc data containing the device coredump
* @datalen: length of the data
* @gfp: allocation flags
*
* This function takes ownership of the vmalloc'ed data and will free
* it when it is no longer used. See dev_coredumpm() for more information.
*/
void dev_coredumpv(struct device *dev, void *data, size_t datalen)
void dev_coredumpv(struct device *dev, void *data, size_t datalen,
gfp_t gfp)
{
dev_coredumpm(dev, NULL, data, datalen, devcd_readv, devcd_freev);
dev_coredumpm(dev, NULL, data, datalen, gfp, devcd_readv, devcd_freev);
}
EXPORT_SYMBOL_GPL(dev_coredumpv);
@ -234,6 +236,7 @@ static ssize_t devcd_read_from_sgtable(char *buffer, loff_t offset,
* @owner: the module that contains the read/free functions, use %THIS_MODULE
* @data: data cookie for the @read/@free functions
* @datalen: length of the data
* @gfp: allocation flags
* @read: function to read from the given buffer
* @free: function to free the given buffer
*
@ -243,7 +246,7 @@ static ssize_t devcd_read_from_sgtable(char *buffer, loff_t offset,
* function will be called to free the data.
*/
void dev_coredumpm(struct device *dev, struct module *owner,
void *data, size_t datalen,
void *data, size_t datalen, gfp_t gfp,
ssize_t (*read)(char *buffer, loff_t offset, size_t count,
void *data, size_t datalen),
void (*free)(void *data))
@ -265,7 +268,7 @@ void dev_coredumpm(struct device *dev, struct module *owner,
if (!try_module_get(owner))
goto free;
devcd = kzalloc(sizeof(*devcd), GFP_KERNEL);
devcd = kzalloc(sizeof(*devcd), gfp);
if (!devcd)
goto put_module;
@ -315,6 +318,7 @@ EXPORT_SYMBOL_GPL(dev_coredumpm);
* @dev: the struct device for the crashed device
* @table: the dump data
* @datalen: length of the data
* @gfp: allocation flags
*
* Creates a new device coredump for the given device. If a previous one hasn't
* been read yet, the new coredump is discarded. The data lifetime is determined
@ -322,9 +326,9 @@ EXPORT_SYMBOL_GPL(dev_coredumpm);
* it will free the data.
*/
void dev_coredumpsg(struct device *dev, struct scatterlist *table,
size_t datalen)
size_t datalen, gfp_t gfp)
{
dev_coredumpm(dev, NULL, table, datalen, devcd_read_from_sgtable,
dev_coredumpm(dev, NULL, table, datalen, gfp, devcd_read_from_sgtable,
devcd_free_sgtable);
}
EXPORT_SYMBOL_GPL(dev_coredumpsg);

2
drivers/bluetooth/btmrvl_sdio.c
View File

@ -1515,7 +1515,7 @@ done:
/* fw_dump_data will be free in device coredump release function
* after 5 min
*/
dev_coredumpv(&card->func->dev, fw_dump_data, fw_dump_len);
dev_coredumpv(&card->func->dev, fw_dump_data, fw_dump_len, GFP_KERNEL);
BT_INFO("== btmrvl firmware dump to /sys/class/devcoredump end");
}

2
drivers/bluetooth/hci_qca.c
View File

@ -1120,7 +1120,7 @@ static void qca_controller_memdump(struct work_struct *work)
qca_memdump->ram_dump_size);
memdump_buf = qca_memdump->memdump_buf_head;
dev_coredumpv(&hu->serdev->dev, memdump_buf,
qca_memdump->received_dump);
qca_memdump->received_dump, GFP_KERNEL);
cancel_delayed_work(&qca->ctrl_memdump_timeout);
kfree(qca->qca_memdump);
qca->qca_memdump = NULL;

2
drivers/gpu/drm/etnaviv/etnaviv_dump.c
View File

@ -225,5 +225,5 @@ void etnaviv_core_dump(struct etnaviv_gem_submit *submit)
etnaviv_core_dump_header(&iter, ETDUMP_BUF_END, iter.data);
dev_coredumpv(gpu->dev, iter.start, iter.data - iter.start);
dev_coredumpv(gpu->dev, iter.start, iter.data - iter.start, GFP_KERNEL);
}

4
drivers/gpu/drm/msm/disp/msm_disp_snapshot.c
View File

@ -74,8 +74,8 @@ static void _msm_disp_snapshot_work(struct kthread_work *work)
* If there is a codedump pending for the device, the dev_coredumpm()
* will also free new coredump state.
*/
dev_coredumpm(disp_state->dev, THIS_MODULE, disp_state, 0,
disp_devcoredump_read, msm_disp_state_free);
dev_coredumpm(disp_state->dev, THIS_MODULE, disp_state, 0, GFP_KERNEL,
disp_devcoredump_read, msm_disp_state_free);
}
void msm_disp_snapshot_state(struct drm_device *drm_dev)

4
drivers/gpu/drm/msm/msm_gpu.c
View File

@ -299,8 +299,8 @@ static void msm_gpu_crashstate_capture(struct msm_gpu *gpu,
gpu->crashstate = state;
/* FIXME: Release the crashstate if this errors out? */
dev_coredumpm(gpu->dev->dev, THIS_MODULE, gpu, 0,
msm_gpu_devcoredump_read, msm_gpu_devcoredump_free);
dev_coredumpm(gpu->dev->dev, THIS_MODULE, gpu, 0, GFP_KERNEL,
msm_gpu_devcoredump_read, msm_gpu_devcoredump_free);
}
#else
static void msm_gpu_crashstate_capture(struct msm_gpu *gpu,

2
drivers/media/platform/qcom/venus/core.c
View File

@ -49,7 +49,7 @@ static void venus_coredump(struct venus_core *core)
memcpy(data, mem_va, mem_size);
memunmap(mem_va);
dev_coredumpv(dev, data, mem_size);
dev_coredumpv(dev, data, mem_size, GFP_KERNEL);
}
static void venus_event_notify(struct venus_core *core, u32 event)

2
drivers/net/can/spi/mcp251xfd/mcp251xfd-dump.c
View File

@ -281,5 +281,5 @@ void mcp251xfd_dump(const struct mcp251xfd_priv *priv)
mcp251xfd_dump_end(priv, &iter);
dev_coredumpv(&priv->spi->dev, iter.start,
iter.data - iter.start);
iter.data - iter.start, GFP_KERNEL);
}

2
drivers/net/wireless/ath/ath10k/coredump.c
View File

@ -1607,7 +1607,7 @@ int ath10k_coredump_submit(struct ath10k *ar)
return -ENODATA;
}
dev_coredumpv(ar->dev, dump, le32_to_cpu(dump->len));
dev_coredumpv(ar->dev, dump, le32_to_cpu(dump->len), GFP_KERNEL);
return 0;
}

2
drivers/net/wireless/ath/wil6210/wil_crash_dump.c
View File

@ -117,6 +117,6 @@ void wil_fw_core_dump(struct wil6210_priv *wil)
/* fw_dump_data will be free in device coredump release function
* after 5 min
*/
dev_coredumpv(wil_to_dev(wil), fw_dump_data, fw_dump_size);
dev_coredumpv(wil_to_dev(wil), fw_dump_data, fw_dump_size, GFP_KERNEL);
wil_info(wil, "fw core dumped, size %d bytes\n", fw_dump_size);
}

2
drivers/net/wireless/broadcom/brcm80211/brcmfmac/debug.c
View File

@ -37,7 +37,7 @@ int brcmf_debug_create_memdump(struct brcmf_bus *bus, const void *data,
return err;
}
dev_coredumpv(bus->dev, dump, len + ramsize);
dev_coredumpv(bus->dev, dump, len + ramsize, GFP_KERNEL);
return 0;
}

6
drivers/net/wireless/intel/iwlwifi/fw/dbg.c
View File

@ -2601,7 +2601,8 @@ static void iwl_fw_error_dump(struct iwl_fw_runtime *fwrt,
fw_error_dump.trans_ptr->data,
fw_error_dump.trans_ptr->len,
fw_error_dump.fwrt_len);
dev_coredumpsg(fwrt->trans->dev, sg_dump_data, file_len);
dev_coredumpsg(fwrt->trans->dev, sg_dump_data, file_len,
GFP_KERNEL);
}
vfree(fw_error_dump.fwrt_ptr);
vfree(fw_error_dump.trans_ptr);
@ -2646,7 +2647,8 @@ static void iwl_fw_error_ini_dump(struct iwl_fw_runtime *fwrt,
entry->data, entry->size, offs);
offs += entry->size;
}
dev_coredumpsg(fwrt->trans->dev, sg_dump_data, file_len);
dev_coredumpsg(fwrt->trans->dev, sg_dump_data, file_len,
GFP_KERNEL);
}
iwl_dump_ini_list_free(&dump_list);
}

3
drivers/net/wireless/marvell/mwifiex/main.c
View File

@ -1115,7 +1115,8 @@ void mwifiex_upload_device_dump(struct mwifiex_adapter *adapter)
*/
mwifiex_dbg(adapter, MSG,
"== mwifiex dump information to /sys/class/devcoredump start\n");
dev_coredumpv(adapter->dev, adapter->devdump_data, adapter->devdump_len);
dev_coredumpv(adapter->dev, adapter->devdump_data, adapter->devdump_len,
GFP_KERNEL);
mwifiex_dbg(adapter, MSG,
"== mwifiex dump information to /sys/class/devcoredump end\n");

3
drivers/net/wireless/mediatek/mt76/mt7615/mac.c
View File

@ -2422,5 +2422,6 @@ void mt7615_coredump_work(struct work_struct *work)
dev_kfree_skb(skb);
}
dev_coredumpv(dev->mt76.dev, dump, MT76_CONNAC_COREDUMP_SZ);
dev_coredumpv(dev->mt76.dev, dump, MT76_CONNAC_COREDUMP_SZ,
GFP_KERNEL);
}

3
drivers/net/wireless/mediatek/mt76/mt7921/mac.c
View File

@ -1419,7 +1419,8 @@ void mt7921_coredump_work(struct work_struct *work)
}
if (dump)
dev_coredumpv(dev->mt76.dev, dump, MT76_CONNAC_COREDUMP_SZ);
dev_coredumpv(dev->mt76.dev, dump, MT76_CONNAC_COREDUMP_SZ,
GFP_KERNEL);
mt7921_reset(&dev->mt76);
}

2
drivers/net/wireless/realtek/rtw88/main.c
View File

@ -414,7 +414,7 @@ static void rtw_fwcd_dump(struct rtw_dev *rtwdev)
* framework. Note that a new dump will be discarded if a previous one
* hasn't been released yet.
*/
dev_coredumpv(rtwdev->dev, desc->data, desc->size);
dev_coredumpv(rtwdev->dev, desc->data, desc->size, GFP_KERNEL);
}
static void rtw_fwcd_free(struct rtw_dev *rtwdev, bool free_self)

2
drivers/net/wireless/realtek/rtw89/ser.c
View File

@ -127,7 +127,7 @@ static void rtw89_ser_cd_send(struct rtw89_dev *rtwdev,
* will be discarded if a previous one hasn't been released by
* framework yet.
*/
dev_coredumpv(rtwdev->dev, buf, sizeof(*buf));
dev_coredumpv(rtwdev->dev, buf, sizeof(*buf), GFP_KERNEL);
}
static void rtw89_ser_cd_free(struct rtw89_dev *rtwdev,

2
drivers/remoteproc/qcom_q6v5_mss.c
View File

@ -597,7 +597,7 @@ static void q6v5_dump_mba_logs(struct q6v5 *qproc)
data = vmalloc(MBA_LOG_SIZE);
if (data) {
memcpy(data, mba_region, MBA_LOG_SIZE);
dev_coredumpv(&rproc->dev, data, MBA_LOG_SIZE);
dev_coredumpv(&rproc->dev, data, MBA_LOG_SIZE, GFP_KERNEL);
}
memunmap(mba_region);
}

8
drivers/remoteproc/remoteproc_coredump.c
View File

@ -309,7 +309,7 @@ void rproc_coredump(struct rproc *rproc)
phdr += elf_size_of_phdr(class);
}
if (dump_conf == RPROC_COREDUMP_ENABLED) {
dev_coredumpv(&rproc->dev, data, data_size);
dev_coredumpv(&rproc->dev, data, data_size, GFP_KERNEL);
return;
}
@ -318,7 +318,7 @@ void rproc_coredump(struct rproc *rproc)
dump_state.header = data;
init_completion(&dump_state.dump_done);
dev_coredumpm(&rproc->dev, NULL, &dump_state, data_size,
dev_coredumpm(&rproc->dev, NULL, &dump_state, data_size, GFP_KERNEL,
rproc_coredump_read, rproc_coredump_free);
/*
@ -449,7 +449,7 @@ void rproc_coredump_using_sections(struct rproc *rproc)
}
if (dump_conf == RPROC_COREDUMP_ENABLED) {
dev_coredumpv(&rproc->dev, data, data_size);
dev_coredumpv(&rproc->dev, data, data_size, GFP_KERNEL);
return;
}
@ -458,7 +458,7 @@ void rproc_coredump_using_sections(struct rproc *rproc)
dump_state.header = data;
init_completion(&dump_state.dump_done);
dev_coredumpm(&rproc->dev, NULL, &dump_state, data_size,
dev_coredumpm(&rproc->dev, NULL, &dump_state, data_size, GFP_KERNEL,
rproc_coredump_read, rproc_coredump_free);
/* Wait until the dump is read and free is called. Data is freed

2
include/drm/drm_print.h
View File

@ -162,7 +162,7 @@ struct drm_print_iterator {
* void makecoredump(...)
* {
* ...
* dev_coredumpm(dev, THIS_MODULE, data, 0,
* dev_coredumpm(dev, THIS_MODULE, data, 0, GFP_KERNEL,
* coredump_read, ...)
* }
*

13
include/linux/devcoredump.h
View File

@ -52,26 +52,27 @@ static inline void _devcd_free_sgtable(struct scatterlist *table)
#ifdef CONFIG_DEV_COREDUMP
void dev_coredumpv(struct device *dev, void *data, size_t datalen);
void dev_coredumpv(struct device *dev, void *data, size_t datalen,
gfp_t gfp);
void dev_coredumpm(struct device *dev, struct module *owner,
void *data, size_t datalen,
void *data, size_t datalen, gfp_t gfp,
ssize_t (*read)(char *buffer, loff_t offset, size_t count,
void *data, size_t datalen),
void (*free)(void *data));
void dev_coredumpsg(struct device *dev, struct scatterlist *table,
size_t datalen);
size_t datalen, gfp_t gfp);
#else
static inline void dev_coredumpv(struct device *dev, void *data,
size_t datalen)
size_t datalen, gfp_t gfp)
{
vfree(data);
}
static inline void
dev_coredumpm(struct device *dev, struct module *owner,
void *data, size_t datalen,
void *data, size_t datalen, gfp_t gfp,
ssize_t (*read)(char *buffer, loff_t offset, size_t count,
void *data, size_t datalen),
void (*free)(void *data))
@ -80,7 +81,7 @@ dev_coredumpm(struct device *dev, struct module *owner,
}
static inline void dev_coredumpsg(struct device *dev, struct scatterlist *table,
size_t datalen)
size_t datalen, gfp_t gfp)
{
_devcd_free_sgtable(table);
}

2
sound/soc/intel/avs/apl.c
View File

@ -164,7 +164,7 @@ static int apl_coredump(struct avs_dev *adev, union avs_notify_msg *msg)
} while (offset < msg->ext.coredump.stack_dump_size);
exit:
dev_coredumpv(adev->dev, dump, dump_size);
dev_coredumpv(adev->dev, dump, dump_size, GFP_KERNEL);
return 0;
}

2
sound/soc/intel/avs/skl.c
View File

@ -88,7 +88,7 @@ static int skl_coredump(struct avs_dev *adev, union avs_notify_msg *msg)
return -ENOMEM;
memcpy_fromio(dump, avs_sram_addr(adev, AVS_FW_REGS_WINDOW), AVS_FW_REGS_SIZE);
dev_coredumpv(adev->dev, dump, AVS_FW_REGS_SIZE);
dev_coredumpv(adev->dev, dump, AVS_FW_REGS_SIZE, GFP_KERNEL);
return 0;
}

2
sound/soc/intel/catpt/dsp.c
View File

@ -539,7 +539,7 @@ int catpt_coredump(struct catpt_dev *cdev)
pos += CATPT_DMA_REGS_SIZE;
}
dev_coredumpv(cdev->dev, dump, dump_size);
dev_coredumpv(cdev->dev, dump, dump_size, GFP_KERNEL);
return 0;
}