[cocci] Moving fwnode_handle_put() calls to a single place with SmPL?

* [cocci] Moving fwnode_handle_put() calls to a single place with SmPL?
@ 2024-02-20 14:05 Markus Elfring
  2024-02-20 15:56 ` Markus Elfring
                   ` (2 more replies)
  0 siblings, 3 replies; 4+ messages in thread
From: Markus Elfring @ 2024-02-20 14:05 UTC (permalink / raw)
  To: cocci

[-- Attachment #1: Type: text/plain, Size: 916 bytes --]

Hello,

I would like to achieve another known source code transformation
also together with the software combination “Coccinelle 1.1.1-00739-g68c580f1”
for the implementation of a function like “pmic_glink_altmode_probe”.

Unfortunately, I stumble on the following test result for the attached two files.

Markus_Elfring@Sonne:…/Projekte/Coccinelle/Probe> time spatch --timeout 123 --show-trying pmic_glink_altmode-excerpt2-20240220.c ../janitor/adjust_exception_handling_in_pmic_glink_altmode-20240220.cocci
…
SPECIAL NAMES: adding device_for_each_child_node as a iterator
…
     trying function: pmic_glink_altmode_probe: pmic_glink_altmode-excerpt2-20240220.c:10
timeout (we abort)
Fatal error: exception Coccinelle_modules.Common.Timeout

real    2m3,829s
user    2m3,014s
sys     0m0,420s

Will there any further software improvements become possible?

Regards,
Markus

[-- Attachment #2: adjust_exception_handling_in_pmic_glink_altmode-20240220.cocci --]
[-- Type: text/plain, Size: 658 bytes --]

// See also:
// https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/log/drivers/soc/qcom/pmic_glink_altmode.c
//
// [PATCH 3/6] soc: qcom: pmic_glink_altmode: fix drm bridge use-after-free
// https://lore.kernel.org/lkml/20240217150228.5788-4-johan+linaro@kernel.org/
// https://lkml.org/lkml/2024/2/17/279

@replacement@
identifier rc;
constant c;
@@
 <+...
 if (...)
 {
    ... when != rc
-   fwnode_handle_put(fwnode);
(
+   rc =
-   return
(          dev_err_probe(...)
|          - c
)   ;
|
-   return rc;
)
+   goto put_fwnode;
 }
 ...+>
 return PTR_ERR_OR_ZERO(altmode->client);
+
+put_fwnode:
+fwnode_handle_put(fwnode);
+return rc;

[-- Attachment #3: pmic_glink_altmode-excerpt2-20240220.c --]
[-- Type: text/x-csrc, Size: 2987 bytes --]

// SPDX-License-Identifier: GPL-2.0-only
/*
 * Copyright (c) 2019-2020, The Linux Foundation. All rights reserved.
 * Copyright (c) 2022, Linaro Ltd
 */
// See also:
// https://git.kernel.org/pub/scm/linux/kernel/git/next/linux-next.git/log/drivers/soc/qcom/pmic_glink_altmode.c

// deleted part
static int pmic_glink_altmode_probe(struct auxiliary_device *adev,
				    const struct auxiliary_device_id *id)
{
	struct pmic_glink_altmode_port *alt_port;
	struct pmic_glink_altmode *altmode;
	const struct of_device_id *match;
	struct fwnode_handle *fwnode;
	struct device *dev = &adev->dev;
	u32 port;
	int ret;
// deleted part
	device_for_each_child_node(dev, fwnode) {
		ret = fwnode_property_read_u32(fwnode, "reg", &port);
		if (ret < 0) {
			dev_err(dev, "missing reg property of %pOFn\n", fwnode);
			fwnode_handle_put(fwnode);
			return ret;
		}

		if (port >= ARRAY_SIZE(altmode->ports)) {
			dev_warn(dev, "invalid connector number, ignoring\n");
			continue;
		}

		if (altmode->ports[port].altmode) {
			dev_err(dev, "multiple connector definition for port %u\n", port);
			fwnode_handle_put(fwnode);
			return -EINVAL;
		}

		alt_port = &altmode->ports[port];
		alt_port->altmode = altmode;
		alt_port->index = port;
		INIT_WORK(&alt_port->work, pmic_glink_altmode_worker);

		alt_port->bridge = drm_dp_hpd_bridge_register(dev, to_of_node(fwnode));
		if (IS_ERR(alt_port->bridge)) {
			fwnode_handle_put(fwnode);
			return PTR_ERR(alt_port->bridge);
		}

		alt_port->dp_alt.svid = USB_TYPEC_DP_SID;
		alt_port->dp_alt.mode = USB_TYPEC_DP_MODE;
		alt_port->dp_alt.active = 1;

		alt_port->typec_mux = fwnode_typec_mux_get(fwnode);
		if (IS_ERR(alt_port->typec_mux)) {
			fwnode_handle_put(fwnode);
			return dev_err_probe(dev, PTR_ERR(alt_port->typec_mux),
					     "failed to acquire mode-switch for port: %d\n",
					     port);
		}

		ret = devm_add_action_or_reset(dev, pmic_glink_altmode_put_mux,
					       alt_port->typec_mux);
		if (ret) {
			fwnode_handle_put(fwnode);
			return ret;
		}

		alt_port->typec_retimer = fwnode_typec_retimer_get(fwnode);
		if (IS_ERR(alt_port->typec_retimer)) {
			fwnode_handle_put(fwnode);
			return dev_err_probe(dev, PTR_ERR(alt_port->typec_retimer),
					     "failed to acquire retimer-switch for port: %d\n",
					     port);
		}

		ret = devm_add_action_or_reset(dev, pmic_glink_altmode_put_retimer,
					       alt_port->typec_retimer);
		if (ret) {
			fwnode_handle_put(fwnode);
			return ret;
		}

		alt_port->typec_switch = fwnode_typec_switch_get(fwnode);
		if (IS_ERR(alt_port->typec_switch)) {
			fwnode_handle_put(fwnode);
			return dev_err_probe(dev, PTR_ERR(alt_port->typec_switch),
					     "failed to acquire orientation-switch for port: %d\n",
					     port);
		}

		ret = devm_add_action_or_reset(dev, pmic_glink_altmode_put_switch,
					       alt_port->typec_switch);
		if (ret) {
			fwnode_handle_put(fwnode);
			return ret;
		}
	}
// deleted part
	return PTR_ERR_OR_ZERO(altmode->client);
}
// deleted part

^ permalink raw reply	[flat|nested] 4+ messages in thread