Commit 38a523a2 authored by Greg Kroah-Hartman's avatar Greg Kroah-Hartman
Browse files

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

This reverts commit 77515eba 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: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 5f8954e0

drivers/base/devcoredump.c

+10 −6
Original line number Diff line number Diff line
@@ -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);

drivers/bluetooth/btmrvl_sdio.c

+1 −1
Original line number Diff line number Diff line
@@ -1515,7 +1515,7 @@ static void btmrvl_sdio_coredump(struct device *dev) 
	/* 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");

}

drivers/bluetooth/hci_qca.c

+1 −1
Original line number Diff line number Diff line
@@ -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;

drivers/gpu/drm/etnaviv/etnaviv_dump.c

+1 −1
Original line number Diff line number Diff line
@@ -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);

}

drivers/gpu/drm/msm/disp/msm_disp_snapshot.c

+2 −2
Original line number Diff line number Diff line
@@ -74,7 +74,7 @@ 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,

	dev_coredumpm(disp_state->dev, THIS_MODULE, disp_state, 0, GFP_KERNEL,

			disp_devcoredump_read, msm_disp_state_free);

}