i40e: Cleanup PTP upon probe failure
Subsystems (2)
PATCH 1/1 i40e: Cleanup PTP upon probe failure
Fix two conditions which would leak PTP registration on probe failure:
1. i40e_setup_pf_switch can encounter an error in i40e_setup_pf_filter_control, call i40e_ptp_init, then return non-zero, sending i40e_probe to err_vsis.
2. i40e_setup_misc_vector can return non-zero, sending i40e_probe to err_vsis.
Found with coccinelle.
--- drivers/net/ethernet/intel/i40e/i40e_main.c | 1 + 1 file changed, 1 insertion(+)
drivers/net/ethernet/intel/i40e/i40e_main.c +1 -0
@@ -16112,6 +16112,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)/* Unwind what we've done if something failed in the setup */ err_vsis:set_bit (__I40E_DOWN, pf->state); +i40e_ptp_stop (pf);i40e_clear_interrupt_scheme (pf);kfree (pf->vsi); err_switch_setup:
Signature · 1 line
2.43.0
Quoted 11 lines · Matt Vollrath
Fix two conditions which would leak PTP registration on probe failure:
1.
i40e_setup_pf_switchcan encounter an error ini40e_setup_pf_filter_control, calli40e_ptp_init, then return non-zero, sendingi40e_probetoerr_vsis.2.
i40e_setup_misc_vectorcan return non-zero, sendingi40e_probetoerr_vsis.Found with coccinelle.
Isn't a Fixes: tag needed?
Quoted 10 lines
Signed-off-by Matt Vollrath <[email protected]>--- drivers/net/ethernet/intel/i40e/i40e_main.c | 1 + 1 file changed, 1 insertion(+)drivers/net/ethernet/intel/i40e/i40e_main.c +0
-0
drivers/net/ethernet/intel/i40e/i40e_main.c static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent) · line 16115
Quoted 4 lines
drivers/net/ethernet/intel/i40e/i40e_main.c +1
-0@@ -16112,6 +16112,7 @@ static int i40e_probe(struct pci_dev *pdev, const struct pci_device_id *ent)/* Unwind what we've done if something failed in the setup */ err_vsis:set_bit (__I40E_DOWN, pf->state); +i40e_ptp_stop (pf);
Perhaps this is a separate issue from this one, but if i40e_probe() fails and jumps to err_switch_setup, doesn't pf->ptp_pins leak?
Also, maybe because I'm not very familiar with this driver, I don't understand why i40e_ptp_alloc_pins() is called this early, outside of i40e_ptp_init(). It seems to make the error-path handling a bit more complicated.
Quoted 5 lines
drivers/net/ethernet/intel/i40e/i40e_main.c +0
-0i40e_clear_interrupt_scheme (pf);kfree (pf->vsi); err_switch_setup:Signature · 1 line
2.43.0
This diff seems mangled, and doesn't apply to my local trees.
Email header says:
User-Agent: Mozilla Thunderbird
...
Content-Type: text/plain; charset=UTF-8; format=flowed
It may be worth disabling format=flowed if you use Thunderbird. See also: https://docs.kernel.org/process/email-clients.html
Quoted 1 line · Kohei Enju
Isn't a Fixes: tag needed?
I will do the forensics and find where at least one of these conditions was introduced.
Quoted 7 lines
Perhaps this is a separate issue from this one, but if
i40e_probe()fails and jumps toerr_switch_setup, doesn'tpf->ptp_pinsleak?Also, maybe because I'm not very familiar with this driver, I don't understand why
i40e_ptp_alloc_pins()is called this early, outside ofi40e_ptp_init(). It seems to make the error-path handling a bit more complicated.
I will look at this, and if I can fix it by adding a pin teardown call to the probe exit path, I will add it.
I don't have hardware to test this with, so I am treading lightly and not changing anything about the order of operations on the way up.
Quoted 9 lines
This diff seems mangled, and doesn't apply to my local trees.
Email header says:
User-Agent: Mozilla Thunderbird
...
Content-Type: text/plain; charset=UTF-8; format=flowedIt may be worth disabling format=flowed if you use Thunderbird. See also: https://docs.kernel.org/process/email-clients.html
It seems like setting up git for email will be the path of least resistance for patches, so I will do that.
Thank you for the feedback.
mv