| Message ID | 20220419102803.3430139-2-schnelle@linux.ibm.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
| Series | PCI: Rework pci_scan_slot() and isolated PCI functions | expand |
Hi Niklas, I'm sure this makes good sense, but I need a little more hand-holding. Sorry this is long and rambling. On Tue, Apr 19, 2022 at 12:28:00PM +0200, Niklas Schnelle wrote: > While determining the next PCI function is factored out of > pci_scan_slot() into next_fn() the former still handles the first > function as a special case duplicating the code from the scan loop and > splitting the condition that the first function exits from it being > multifunction which is tested in next_fn(). > > Furthermore the non ARI branch of next_fn() mixes the case that > multifunction devices may have non-contiguous function ranges and dev > may thus be NULL with the multifunction requirement. It also signals > that no further functions need to be scanned by returning 0 which is > a valid function number. > > Improve upon this by moving all conditions for having to scan for more > functions into next_fn() and make them obvious and commented. > > By changing next_fn() to return -ENODEV instead of 0 when there is no > next function we can then handle the initial function inside the loop > and deduplicate the shared handling. > > No functional change is intended. > > Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com> > --- > drivers/pci/probe.c | 41 +++++++++++++++++++---------------------- > 1 file changed, 19 insertions(+), 22 deletions(-) > > diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c > index 17a969942d37..389aa1f9cb2c 100644 > --- a/drivers/pci/probe.c > +++ b/drivers/pci/probe.c > @@ -2579,33 +2579,35 @@ struct pci_dev *pci_scan_single_device(struct pci_bus *bus, int devfn) > } > EXPORT_SYMBOL(pci_scan_single_device); > > -static unsigned int next_fn(struct pci_bus *bus, struct pci_dev *dev, > - unsigned int fn) > +static int next_fn(struct pci_bus *bus, struct pci_dev *dev, int fn) > { > int pos; > u16 cap = 0; > unsigned int next_fn; > > - if (pci_ari_enabled(bus)) { > - if (!dev) > - return 0; > + if (dev && pci_ari_enabled(bus)) { I think this would be easier to verify if we kept the explicit error return, e.g., if (pci_ari_enabled(bus)) { if (!dev) return -ENODEV; pos = pci_find_ext_capability(...); Otherwise we have to sort through the !dev cases below. I guess -ENODEV would come from either the "!fn && !dev" case or the "fn > 6" case, but it's not obvious to me that those are equivalent to the previous code. > pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ARI); > if (!pos) > - return 0; > + return -ENODEV; > > pci_read_config_word(dev, pos + PCI_ARI_CAP, &cap); > next_fn = PCI_ARI_CAP_NFN(cap); > if (next_fn <= fn) > - return 0; /* protect against malformed list */ > + return -ENODEV; /* protect against malformed list */ > > return next_fn; > } > > - /* dev may be NULL for non-contiguous multifunction devices */ > - if (!dev || dev->multifunction) > - return (fn + 1) % 8; > - > - return 0; > + /* only multifunction devices may have more functions */ > + if (dev && !dev->multifunction) > + return -ENODEV; I don't understand why the "!dev || dev->multifunction" test needs to change. Isn't that valid even in the hypervisor case? IIUC, you want to return success in some cases that currently return failure, so this case that was already success should be fine as it was. Is this because "(fn + 1) % 8" may be zero, which previously terminated the loop, but now it doesn't because "fn == 0" is the *first* execution of the loop? If so, I wonder if we could avoid that case by adding: if (fn >= 7) return -ENODEV; at the very beginning. Maybe that would allow a more trivial patch that just changed the error return from 0 to -ENODEV, i.e., leaving all the logic in next_fn() unchanged? I'm wondering if this could end up like: if (fn >= 7) return -ENODEV; if (pci_ari_enabled(bus)) { if (!dev) return -ENODEV; ... return next_fn; } if (!dev || dev->multifunction) return (fn + 1) % 8; + if (hypervisor_isolated_pci_functions()) + return (fn + 1) % 8; return -ENODEV; (The hypervisor part being added in a subsequent patch, and I'm not sure exactly what logic you need there -- the point being that it's just an additional success case.) The "% 8" seems possibly superfluous then, since previously that caused a zero return that terminated the loop. If we're using -ENODEV to terminate the loop, we probably don't care about the mod 8. > + /* > + * A function 0 is required but multifunction devices may > + * be non-contiguous so dev can be NULL otherwise. I understood the original "dev may be NULL ..." comment, but I can't quite parse this. "dev can be NULL" for non-zero functions? That's basically what it said before, but it's not clear what "otherwise" refers to. > + */ > + if (!fn && !dev) > + return -ENODEV; This part isn't obvious to me yet, partly because of the "!fn && !dev" construction. The negatives make it hard to parse. Since "fn" isn't a boolean or a pointer, I think "fn == 0" is easier to read than "!fn". I would test "dev" first since it logically precedes "fn". IIUC !dev means we haven't found a function at this device number yet. So this: if (!dev && fn == 0) return -ENODEV; means we called pci_scan_single_device(bus, devfn + 0) the first time through the loop, and it didn't find a device so it returned NULL. > + return (fn <= 6) ? fn + 1 : -ENODEV; > } > > static int only_one_child(struct pci_bus *bus) > @@ -2643,24 +2645,19 @@ static int only_one_child(struct pci_bus *bus) > */ > int pci_scan_slot(struct pci_bus *bus, int devfn) > { > - unsigned int fn, nr = 0; > - struct pci_dev *dev; > + int fn, nr = 0; > + struct pci_dev *dev = NULL; > > if (only_one_child(bus) && (devfn > 0)) > return 0; /* Already scanned the entire slot */ > > - dev = pci_scan_single_device(bus, devfn); > - if (!dev) > - return 0; > - if (!pci_dev_is_added(dev)) > - nr++; > - > - for (fn = next_fn(bus, dev, 0); fn > 0; fn = next_fn(bus, dev, fn)) { > + for (fn = 0; fn >= 0; fn = next_fn(bus, dev, fn)) { > dev = pci_scan_single_device(bus, devfn + fn); "devfn + fn" (in the existing, unchanged code) is a little bit weird. In almost all cases, devfn is the result of "PCI_DEVFN(slot, 0)", so we could make the interface: pci_scan_slot(struct pci_bus *bus, int dev) where "dev" is 0-31. The only exceptions are a couple hotplug drivers where the fn probably is or should be 0, too, but I haven't verified that. But this would be scope creep, so possibly something we could consider in the future, but not for this series. > if (dev) { > if (!pci_dev_is_added(dev)) > nr++; > - dev->multifunction = 1; > + if (nr > 1) > + dev->multifunction = 1; > } > } > > -- > 2.32.0 >
On Wed, 2022-04-20 at 21:14 -0500, Bjorn Helgaas wrote: > Hi Niklas, > > I'm sure this makes good sense, but I need a little more hand-holding. > Sorry this is long and rambling. > > On Tue, Apr 19, 2022 at 12:28:00PM +0200, Niklas Schnelle wrote: > > While determining the next PCI function is factored out of > > pci_scan_slot() into next_fn() the former still handles the first > > function as a special case duplicating the code from the scan loop and > > splitting the condition that the first function exits from it being > > multifunction which is tested in next_fn(). > > > > Furthermore the non ARI branch of next_fn() mixes the case that > > multifunction devices may have non-contiguous function ranges and dev > > may thus be NULL with the multifunction requirement. It also signals > > that no further functions need to be scanned by returning 0 which is > > a valid function number. > > > > Improve upon this by moving all conditions for having to scan for more > > functions into next_fn() and make them obvious and commented. > > > > By changing next_fn() to return -ENODEV instead of 0 when there is no > > next function we can then handle the initial function inside the loop > > and deduplicate the shared handling. > > > > No functional change is intended. > > > > Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com> > > --- > > drivers/pci/probe.c | 41 +++++++++++++++++++---------------------- > > 1 file changed, 19 insertions(+), 22 deletions(-) > > > > diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c > > index 17a969942d37..389aa1f9cb2c 100644 > > --- a/drivers/pci/probe.c > > +++ b/drivers/pci/probe.c > > @@ -2579,33 +2579,35 @@ struct pci_dev *pci_scan_single_device(struct pci_bus *bus, int devfn) > > } > > EXPORT_SYMBOL(pci_scan_single_device); > > > > -static unsigned int next_fn(struct pci_bus *bus, struct pci_dev *dev, > > - unsigned int fn) > > +static int next_fn(struct pci_bus *bus, struct pci_dev *dev, int fn) > > { > > int pos; > > u16 cap = 0; > > unsigned int next_fn; > > > > - if (pci_ari_enabled(bus)) { > > - if (!dev) > > - return 0; > > + if (dev && pci_ari_enabled(bus)) { > > I think this would be easier to verify if we kept the explicit error > return, e.g., > > if (pci_ari_enabled(bus)) { > if (!dev) > return -ENODEV; > pos = pci_find_ext_capability(...); > > Otherwise we have to sort through the !dev cases below. I guess > -ENODEV would come from either the "!fn && !dev" case or the "fn > 6" > case, but it's not obvious to me that those are equivalent to the > previous code. We could keep this the same for this patch but I think for jailhouse (patch 2) we need the "!dev" case not to fail here such that we can handle the missing function 0 below even if ARI is enabled. For s390 this doesn't currently matter because pci_ari_enabled(bus) is always false but I assumed that this isn't necessarily so for jailhouse. I sent a follow up mail on a slight behavior change I can think of for this case for v2 but forgot to send it also for v3. Quoted below: "This part here theoretically changes the behavior slightly. If the ARI information is wrong/lands us in a "hole" we may look for more functions via the non-ARI path. Not sure if that is relevant though as in the worst case we might find functions that we otherwise wouldn't have seen. Seems rather obsure to me but I might be wrong, we currently don't see the ARI capability in Linux on IBM Z so I have less experience with this. I did of course boot test on my x86_64 workstation." > > > pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ARI); > > if (!pos) > > - return 0; > > + return -ENODEV; > > > > pci_read_config_word(dev, pos + PCI_ARI_CAP, &cap); > > next_fn = PCI_ARI_CAP_NFN(cap); > > if (next_fn <= fn) > > - return 0; /* protect against malformed list */ > > + return -ENODEV; /* protect against malformed list */ > > > > return next_fn; > > } > > > > - /* dev may be NULL for non-contiguous multifunction devices */ > > - if (!dev || dev->multifunction) > > - return (fn + 1) % 8; > > - > > - return 0; > > + /* only multifunction devices may have more functions */ > > + if (dev && !dev->multifunction) > > + return -ENODEV; > > I don't understand why the "!dev || dev->multifunction" test needs to > change. Isn't that valid even in the hypervisor case? IIUC, you want > to return success in some cases that currently return failure, so this > case that was already success should be fine as it was. This isn't a change to the test. It's the negation of the logical condition *and* a switch of the branches i.e. keeps the overall behavior exactly the same. The equivalence is !(!A || B) == (A && !B). There are two reasons I did this. 1. I find (!dev || dev->multifunction) to be much harder to grasp than (dev && !dev->multifunction). 2. The whole next_fn() in my opinion becomes easier to read if it bails for all bad cases early and the "this is the next fn" is the final return if we didn't bail. This becomes even more true as another condition is added in patch 2. > > Is this because "(fn + 1) % 8" may be zero, which previously > terminated the loop, but now it doesn't because "fn == 0" is the > *first* execution of the loop? Yes with function 0 handled in the loop we can't use 0 as the termination indication. Also I find it generally weird to use a wrap around for this. > > If so, I wonder if we could avoid that case by adding: > > if (fn >= 7) > return -ENODEV; > > at the very beginning. Maybe that would allow a more trivial patch > that just changed the error return from 0 to -ENODEV, i.e., leaving > all the logic in next_fn() unchanged? I think this is equivalent to the ternary at the return. Both return -ENODEV for fn >= 7. I do like your idea better though as it keeps with the scheme of my point 2 above and ternaries are ever so slightly harder to read. > > I'm wondering if this could end up like: > > if (fn >= 7) > return -ENODEV; > > if (pci_ari_enabled(bus)) { > if (!dev) > return -ENODEV; > ... > return next_fn; > } > > if (!dev || dev->multifunction) > return (fn + 1) % 8; > > + if (hypervisor_isolated_pci_functions()) > + return (fn + 1) % 8; > > return -ENODEV; > > (The hypervisor part being added in a subsequent patch, and I'm not > sure exactly what logic you need there -- the point being that it's > just an additional success case.) Yes pretty much only that by negating the success case and switching the branches we end up with a list of fail/bail checks and a single success return even with the hyperisor check added. Also not sure if the "fn >= 7" check should rather go after the ARI path to keep them separate doesn't really matter of course. > > The "% 8" seems possibly superfluous then, since previously that > caused a zero return that terminated the loop. If we're using -ENODEV > to terminate the loop, we probably don't care about the mod 8. Yes > > > + /* > > + * A function 0 is required but multifunction devices may > > + * be non-contiguous so dev can be NULL otherwise. > > I understood the original "dev may be NULL ..." comment, but I can't > quite parse this. "dev can be NULL" for non-zero functions? That's > basically what it said before, but it's not clear what "otherwise" > refers to. I agree this can probably be improved. I'm trying to say that dev can be NULL if it is not function 0 which must exist. Maybe: "dev may be NULL as multifunction devices may be non-contiguous but a function 0 is required" > > > + */ > > + if (!fn && !dev) > > + return -ENODEV; > > This part isn't obvious to me yet, partly because of the "!fn && !dev" > construction. The negatives make it hard to parse. > > Since "fn" isn't a boolean or a pointer, I think "fn == 0" is easier > to read than "!fn". I would test "dev" first since it logically > precedes "fn". I agree about the "fn == 0", I only used "!fn" because I remember getting checkpatch warnings for "foo == 0" in the past. I'll change to fn == 0. As for the order see below. > > IIUC !dev means we haven't found a function at this device number yet. > So this: > > if (!dev && fn == 0) > return -ENODEV; > > means we called pci_scan_single_device(bus, devfn + 0) the first time > through the loop, and it didn't find a device so it returned NULL. Yes. This is "dev may be NULL unless we're looking at function 0". The fn came before dev because I wrote it as "function 0 must not be NULL" but it could also be "dev is NULL and we're looking at function 0", I have no clear preference. This is also the case that gets changed by patch 2 to become: "function 0 must not be NULL unless we have isolated PCI functions" or with the order switched: "dev is NULL and we're looking at function 0 and don't have isolated PCI functions" > > > + return (fn <= 6) ? fn + 1 : -ENODEV; > > } > > > > static int only_one_child(struct pci_bus *bus) > > @@ -2643,24 +2645,19 @@ static int only_one_child(struct pci_bus *bus) > > */ > > int pci_scan_slot(struct pci_bus *bus, int devfn) > > { > > - unsigned int fn, nr = 0; > > - struct pci_dev *dev; > > + int fn, nr = 0; > > + struct pci_dev *dev = NULL; > > > > if (only_one_child(bus) && (devfn > 0)) > > return 0; /* Already scanned the entire slot */ > > > > - dev = pci_scan_single_device(bus, devfn); > > - if (!dev) > > - return 0; > > - if (!pci_dev_is_added(dev)) > > - nr++; > > - > > - for (fn = next_fn(bus, dev, 0); fn > 0; fn = next_fn(bus, dev, fn)) { > > + for (fn = 0; fn >= 0; fn = next_fn(bus, dev, fn)) { > > dev = pci_scan_single_device(bus, devfn + fn); > > "devfn + fn" (in the existing, unchanged code) is a little bit weird. > In almost all cases, devfn is the result of "PCI_DEVFN(slot, 0)", so > we could make the interface: > > pci_scan_slot(struct pci_bus *bus, int dev) > > where "dev" is 0-31. > > The only exceptions are a couple hotplug drivers where the fn probably > is or should be 0, too, but I haven't verified that. > > But this would be scope creep, so possibly something we could consider > in the future, but not for this series. Hmm, I see your point. It makes little sense to have a devfn that isn't from PCI_DEVFN(slot, 0) and not use pci_scan_single_device() instead. > > > if (dev) { > > if (!pci_dev_is_added(dev)) > > nr++; > > - dev->multifunction = 1; > > + if (nr > 1) > > + dev->multifunction = 1; > > } > > } > > > > -- > > 2.32.0 > >
> > > + return (fn <= 6) ? fn + 1 : -ENODEV; > > > } > > > > > > static int only_one_child(struct pci_bus *bus) > > > @@ -2643,24 +2645,19 @@ static int only_one_child(struct pci_bus *bus) > > > */ > > > int pci_scan_slot(struct pci_bus *bus, int devfn) > > > { > > > - unsigned int fn, nr = 0; > > > - struct pci_dev *dev; > > > + int fn, nr = 0; > > > + struct pci_dev *dev = NULL; > > > > > > if (only_one_child(bus) && (devfn > 0)) > > > return 0; /* Already scanned the entire slot */ > > > > > > - dev = pci_scan_single_device(bus, devfn); > > > - if (!dev) > > > - return 0; > > > As it might not have been clear in my previous mail. The above !dev test just for the "devfn + 0" case is equivalent to the new: if (!dev && fn == 0) return -ENODEV; As fn doesn't wrap around anymore fn == 0 is true only for the first iteration. Both in the existing and in the changed code the first pci_scan_single_device() happens before the first next_fn() call though with the new code that then breaks the loop instead of the above return. This makes sense in my mind because if the first function doesn't exist there are no more functions except if we have isolated PCI functions due to a hypervisor.
On Thu, Apr 21, 2022 at 11:27:42AM +0200, Niklas Schnelle wrote: > On Wed, 2022-04-20 at 21:14 -0500, Bjorn Helgaas wrote: > > On Tue, Apr 19, 2022 at 12:28:00PM +0200, Niklas Schnelle wrote: > > > While determining the next PCI function is factored out of > > > pci_scan_slot() into next_fn() the former still handles the first > > > function as a special case duplicating the code from the scan loop and > > > splitting the condition that the first function exits from it being > > > multifunction which is tested in next_fn(). > > > > > > Furthermore the non ARI branch of next_fn() mixes the case that > > > multifunction devices may have non-contiguous function ranges and dev > > > may thus be NULL with the multifunction requirement. It also signals > > > that no further functions need to be scanned by returning 0 which is > > > a valid function number. > > > > > > Improve upon this by moving all conditions for having to scan for more > > > functions into next_fn() and make them obvious and commented. > > > > > > By changing next_fn() to return -ENODEV instead of 0 when there is no > > > next function we can then handle the initial function inside the loop > > > and deduplicate the shared handling. > > > > > > No functional change is intended. > > > > > > Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com> > > > --- > > > drivers/pci/probe.c | 41 +++++++++++++++++++---------------------- > > > 1 file changed, 19 insertions(+), 22 deletions(-) > > > > > > diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c > > > index 17a969942d37..389aa1f9cb2c 100644 > > > --- a/drivers/pci/probe.c > > > +++ b/drivers/pci/probe.c > > > @@ -2579,33 +2579,35 @@ struct pci_dev *pci_scan_single_device(struct pci_bus *bus, int devfn) > > > } > > > EXPORT_SYMBOL(pci_scan_single_device); > > > > > > -static unsigned int next_fn(struct pci_bus *bus, struct pci_dev *dev, > > > - unsigned int fn) > > > +static int next_fn(struct pci_bus *bus, struct pci_dev *dev, int fn) > > > { > > > int pos; > > > u16 cap = 0; > > > unsigned int next_fn; > > > > > > - if (pci_ari_enabled(bus)) { > > > - if (!dev) > > > - return 0; > > > + if (dev && pci_ari_enabled(bus)) { > > > > I think this would be easier to verify if we kept the explicit error > > return, e.g., > > > > if (pci_ari_enabled(bus)) { > > if (!dev) > > return -ENODEV; > > pos = pci_find_ext_capability(...); > > > > Otherwise we have to sort through the !dev cases below. I guess > > -ENODEV would come from either the "!fn && !dev" case or the "fn > 6" > > case, but it's not obvious to me that those are equivalent to the > > previous code. > > We could keep this the same for this patch but I think for jailhouse > (patch 2) we need the "!dev" case not to fail here such that we can > handle the missing function 0 below even if ARI is enabled. For s390 > this doesn't currently matter because pci_ari_enabled(bus) is always > false but I assumed that this isn't necessarily so for jailhouse. I > sent a follow up mail on a slight behavior change I can think of for > this case for v2 but forgot to send it also for v3. Quoted below: I think it would be good to make the first patch change as little as possible to make it easier to analyze, then possibly test for hypervisor when changing this behavior. > > > - /* dev may be NULL for non-contiguous multifunction devices */ > > > - if (!dev || dev->multifunction) > > > - return (fn + 1) % 8; > > > - > > > - return 0; > > > + /* only multifunction devices may have more functions */ > > > + if (dev && !dev->multifunction) > > > + return -ENODEV; > > > > I don't understand why the "!dev || dev->multifunction" test needs to > > change. Isn't that valid even in the hypervisor case? IIUC, you want > > to return success in some cases that currently return failure, so this > > case that was already success should be fine as it was. > > This isn't a change to the test. It's the negation of the logical > condition *and* a switch of the branches i.e. keeps the overall > behavior exactly the same. The equivalence is !(!A || B) == (A && !B). I see the Boolean equivalence, but it's difficult to verify that the consequences are equivalent because the new code has the extra "!fn && !dev" test in the middle. > There are two reasons I did this. > > 1. I find (!dev || dev->multifunction) to be much harder to grasp than > (dev && !dev->multifunction). > > 2. The whole next_fn() in my opinion becomes easier to read if it bails > for all bad cases early and the "this is the next fn" is the final > return if we didn't bail. This becomes even more true as another > condition is added in patch 2. Fair enough, and I agree that "this is the next fn" is a nice final return. In general I think it's good to return either an error or the next fn as soon as it is known. It makes it harder to analyze if the return value has already been determined but we have to mentally pass over subsequent tests that don't affect it. > > Is this because "(fn + 1) % 8" may be zero, which previously > > terminated the loop, but now it doesn't because "fn == 0" is the > > *first* execution of the loop? > > Yes with function 0 handled in the loop we can't use 0 as the > termination indication. Also I find it generally weird to use a wrap > around for this. Yes, I agree that's weird. Usually I prefer "for" loops over "do ... while", but this might be a case where it makes sense -- we *always* want to call pci_scan_single_device() once, and "do ... while" would accomplish that without any fuss. It might even allow us to keep the 0 return value as the termination condition, which would be nice because fn could stay unsigned and it would reduce the size of this patch. I'm hoping we can end up with something like this: unsigned int next_fn(bus, dev, fn, mf) { if (ari(bus)) { if (!dev) return 0; return PCI_ARI_CAP_NFN(); } if (fn >= 7) return 0; if (mf) return fn + 1; if (hypervisor()) return fn + 1; return 0; } int pci_scan_slot(...) { unsigned int fn = 0, mf = 0; do { dev = pci_scan_single_device(bus, devfn + fn); if (dev && dev->multifunction) mf = 1; fn = next_fn(dev, fn, mf); } while (fn); } This would be minimal change to next_fn(): just add the "mf" parameter, which removes a lot of the confusing "dev" and "!dev" testing, and add the "fn >= 7" to remove the implicit "% 8 == 0" failure case. Then the jailhouse/s390 patch would trivially add the new hypervisor case, which is clearly separated from everything else. > > If so, I wonder if we could avoid that case by adding: > > > > if (fn >= 7) > > return -ENODEV; > > > > at the very beginning. Maybe that would allow a more trivial patch > > that just changed the error return from 0 to -ENODEV, i.e., leaving > > all the logic in next_fn() unchanged? > > I think this is equivalent to the ternary at the return. Both return > -ENODEV for fn >= 7. I do like your idea better though as it keeps with > the scheme of my point 2 above and ternaries are ever so slightly > harder to read. Oops, I don't think we can do this directly because in the ARI case, fn is basically 8 bits wide so can be 0-255. Bjorn
On Thu, 2022-04-21 at 12:09 -0500, Bjorn Helgaas wrote: > On Thu, Apr 21, 2022 at 11:27:42AM +0200, Niklas Schnelle wrote: > > On Wed, 2022-04-20 at 21:14 -0500, Bjorn Helgaas wrote: > > > On Tue, Apr 19, 2022 at 12:28:00PM +0200, Niklas Schnelle wrote: > > > > While determining the next PCI function is factored out of > > > > pci_scan_slot() into next_fn() the former still handles the first > > > > function as a special case duplicating the code from the scan loop and > > > > splitting the condition that the first function exits from it being > > > > multifunction which is tested in next_fn(). > > > > > > > > Furthermore the non ARI branch of next_fn() mixes the case that > > > > multifunction devices may have non-contiguous function ranges and dev > > > > may thus be NULL with the multifunction requirement. It also signals > > > > that no further functions need to be scanned by returning 0 which is > > > > a valid function number. > > > > > > > > Improve upon this by moving all conditions for having to scan for more > > > > functions into next_fn() and make them obvious and commented. > > > > > > > > By changing next_fn() to return -ENODEV instead of 0 when there is no > > > > next function we can then handle the initial function inside the loop > > > > and deduplicate the shared handling. > > > > > > > > No functional change is intended. > > > > > > > > Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com> > > > > --- > > > > drivers/pci/probe.c | 41 +++++++++++++++++++---------------------- > > > > 1 file changed, 19 insertions(+), 22 deletions(-) > > > > > > > > diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c > > > > index 17a969942d37..389aa1f9cb2c 100644 > > > > --- a/drivers/pci/probe.c > > > > +++ b/drivers/pci/probe.c > > > > @@ -2579,33 +2579,35 @@ struct pci_dev *pci_scan_single_device(struct pci_bus *bus, int devfn) > > > > } > > > > EXPORT_SYMBOL(pci_scan_single_device); > > > > > > > > -static unsigned int next_fn(struct pci_bus *bus, struct pci_dev *dev, > > > > - unsigned int fn) > > > > +static int next_fn(struct pci_bus *bus, struct pci_dev *dev, int fn) > > > > { > > > > int pos; > > > > u16 cap = 0; > > > > unsigned int next_fn; > > > > > > > > - if (pci_ari_enabled(bus)) { > > > > - if (!dev) > > > > - return 0; > > > > + if (dev && pci_ari_enabled(bus)) { > > > > > > I think this would be easier to verify if we kept the explicit error > > > return, e.g., > > > > > > if (pci_ari_enabled(bus)) { > > > if (!dev) > > > return -ENODEV; > > > pos = pci_find_ext_capability(...); > > > > > > Otherwise we have to sort through the !dev cases below. I guess > > > -ENODEV would come from either the "!fn && !dev" case or the "fn > 6" > > > case, but it's not obvious to me that those are equivalent to the > > > previous code. > > > > We could keep this the same for this patch but I think for jailhouse > > (patch 2) we need the "!dev" case not to fail here such that we can > > handle the missing function 0 below even if ARI is enabled. For s390 > > this doesn't currently matter because pci_ari_enabled(bus) is always > > false but I assumed that this isn't necessarily so for jailhouse. I > > sent a follow up mail on a slight behavior change I can think of for > > this case for v2 but forgot to send it also for v3. Quoted below: > > I think it would be good to make the first patch change as little as > possible to make it easier to analyze, then possibly test for > hypervisor when changing this behavior. Yes makes sense, in my current local version I've kept the direct return here. I think I've also found a way to keep this even for the isolated PCI function case. See below. > > > > > - /* dev may be NULL for non-contiguous multifunction devices */ > > > > - if (!dev || dev->multifunction) > > > > - return (fn + 1) % 8; > > > > - > > > > - return 0; > > > > + /* only multifunction devices may have more functions */ > > > > + if (dev && !dev->multifunction) > > > > + return -ENODEV; > > > > > > I don't understand why the "!dev || dev->multifunction" test needs to > > > change. Isn't that valid even in the hypervisor case? IIUC, you want > > > to return success in some cases that currently return failure, so this > > > case that was already success should be fine as it was. > > > > This isn't a change to the test. It's the negation of the logical > > condition *and* a switch of the branches i.e. keeps the overall > > behavior exactly the same. The equivalence is !(!A || B) == (A && !B). > > I see the Boolean equivalence, but it's difficult to verify that the > consequences are equivalent because the new code has the extra "!fn && > !dev" test in the middle. Ok. I would argue that the "fn == 0 && !dev" is just the moved "!dev" check for the initial pci_scan_single_device() that previously happened outside the loop. With the modulo gone I can't think of any other way to get fn == 0 but in the first iteration. But you are right, the extra test introduces some extra churn in next_fn(). I think we can get rid of that new condition such that next_fn() is more easily verifiable. See below. > > > There are two reasons I did this. > > > > 1. I find (!dev || dev->multifunction) to be much harder to grasp than > > (dev && !dev->multifunction). > > > > 2. The whole next_fn() in my opinion becomes easier to read if it bails > > for all bad cases early and the "this is the next fn" is the final > > return if we didn't bail. This becomes even more true as another > > condition is added in patch 2. > > Fair enough, and I agree that "this is the next fn" is a nice final > return. In general I think it's good to return either an error or the > next fn as soon as it is known. It makes it harder to analyze if the > return value has already been determined but we have to mentally pass > over subsequent tests that don't affect it. I agree and I think we can get this with the transformed cases too. > > > > Is this because "(fn + 1) % 8" may be zero, which previously > > > terminated the loop, but now it doesn't because "fn == 0" is the > > > *first* execution of the loop? > > > > Yes with function 0 handled in the loop we can't use 0 as the > > termination indication. Also I find it generally weird to use a wrap > > around for this. > > Yes, I agree that's weird. Usually I prefer "for" loops over > "do ... while", but this might be a case where it makes sense -- > we *always* want to call pci_scan_single_device() once, and > "do ... while" would accomplish that without any fuss. It might even > allow us to keep the 0 return value as the termination condition, > which would be nice because fn could stay unsigned and it would reduce > the size of this patch. To me the 0 return is part of the weirdness as it is a valid fn value, so returning it from next_fn() would naturally communicate that the next fn is fn 0 not that there are no more functions. It feels like making next_fn() more obvious is worth the larger patch. I think us having to convince ourselves of these details is testament that it currently is very hard to understand the interactions here while the new conditions for stopping the scan are each almost obvious. So I think if we can convince ourselves that the new code is exactly equivalent which I believe it is when keeping the check in the ARI path, then that is what makes the patch save. > > I'm hoping we can end up with something like this: > > unsigned int next_fn(bus, dev, fn, mf) > { > if (ari(bus)) { > if (!dev) > return 0; > return PCI_ARI_CAP_NFN(); > } > > if (fn >= 7) > return 0; > > if (mf) > return fn + 1; > > if (hypervisor()) > return fn + 1; Ooh, just realized that my series changes the behavior for jailhouse when the passed through device is not multifunction. In the existing code pci_scan_single_device() is called for all devfn irrespective of whether the first function found has dev->multifunction set after scanning it. I'm not sure if that would happen if e.g. we have multiple SR-IOV VFs but not the PF. > > return 0; > } > > int pci_scan_slot(...) > { > unsigned int fn = 0, mf = 0; > > do { > dev = pci_scan_single_device(bus, devfn + fn); > if (dev && dev->multifunction) > mf = 1; > fn = next_fn(dev, fn, mf); > } while (fn); > } > > This would be minimal change to next_fn(): just add the "mf" > parameter, which removes a lot of the confusing "dev" and "!dev" > testing, and add the "fn >= 7" to remove the implicit "% 8 == 0" > failure case. The extra mf parameter feels a bit superflous as we already have dev- >multifunction and then would just move the "dev && (!)dev- >multifunction" test out of next_fn(). To me this doesn't look like less of a change to next_fn() either. That said, it gave me an idea. One way to change next_fn() less is to keep the "fn == 0 && !dev" test out of it and in pci_scan_slot(). That way there are no new conditions in next_fn() and the existing conditions can be transformed as proposed without mixing in new stuff. With that the scan loop would look something like: int pci_scan_slot(...) { int fn = 0, nr =0 ; do { dev = pci_scan_single_device(bus, devfn + fn); if (dev) { ... } else if (fn == 0) { /* missing function 0*/ break; } fn = next_fn(bus, dev, fn); } while (fn); } Even better this allows us to keep the "!dev" check in the ARI case as we don't have to handle the missing function 0 in next_fn(). Let me sent you this variant before we abandon the -ENODEV return and condition transforms. > > Then the jailhouse/s390 patch would trivially add the new hypervisor > case, which is clearly separated from everything else. > > > > If so, I wonder if we could avoid that case by adding: > > > > > > if (fn >= 7) > > > return -ENODEV; > > > > > > at the very beginning. Maybe that would allow a more trivial patch > > > that just changed the error return from 0 to -ENODEV, i.e., leaving > > > all the logic in next_fn() unchanged? > > > > I think this is equivalent to the ternary at the return. Both return > > -ENODEV for fn >= 7. I do like your idea better though as it keeps with > > the scheme of my point 2 above and ternaries are ever so slightly > > harder to read. > > Oops, I don't think we can do this directly because in the ARI case, > fn is basically 8 bits wide so can be 0-255. > > Bjorn True, we really do need to keep the ARI case separate.
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index 17a969942d37..389aa1f9cb2c 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -2579,33 +2579,35 @@ struct pci_dev *pci_scan_single_device(struct pci_bus *bus, int devfn) } EXPORT_SYMBOL(pci_scan_single_device); -static unsigned int next_fn(struct pci_bus *bus, struct pci_dev *dev, - unsigned int fn) +static int next_fn(struct pci_bus *bus, struct pci_dev *dev, int fn) { int pos; u16 cap = 0; unsigned int next_fn; - if (pci_ari_enabled(bus)) { - if (!dev) - return 0; + if (dev && pci_ari_enabled(bus)) { pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ARI); if (!pos) - return 0; + return -ENODEV; pci_read_config_word(dev, pos + PCI_ARI_CAP, &cap); next_fn = PCI_ARI_CAP_NFN(cap); if (next_fn <= fn) - return 0; /* protect against malformed list */ + return -ENODEV; /* protect against malformed list */ return next_fn; } - /* dev may be NULL for non-contiguous multifunction devices */ - if (!dev || dev->multifunction) - return (fn + 1) % 8; - - return 0; + /* only multifunction devices may have more functions */ + if (dev && !dev->multifunction) + return -ENODEV; + /* + * A function 0 is required but multifunction devices may + * be non-contiguous so dev can be NULL otherwise. + */ + if (!fn && !dev) + return -ENODEV; + return (fn <= 6) ? fn + 1 : -ENODEV; } static int only_one_child(struct pci_bus *bus) @@ -2643,24 +2645,19 @@ static int only_one_child(struct pci_bus *bus) */ int pci_scan_slot(struct pci_bus *bus, int devfn) { - unsigned int fn, nr = 0; - struct pci_dev *dev; + int fn, nr = 0; + struct pci_dev *dev = NULL; if (only_one_child(bus) && (devfn > 0)) return 0; /* Already scanned the entire slot */ - dev = pci_scan_single_device(bus, devfn); - if (!dev) - return 0; - if (!pci_dev_is_added(dev)) - nr++; - - for (fn = next_fn(bus, dev, 0); fn > 0; fn = next_fn(bus, dev, fn)) { + for (fn = 0; fn >= 0; fn = next_fn(bus, dev, fn)) { dev = pci_scan_single_device(bus, devfn + fn); if (dev) { if (!pci_dev_is_added(dev)) nr++; - dev->multifunction = 1; + if (nr > 1) + dev->multifunction = 1; } }
While determining the next PCI function is factored out of pci_scan_slot() into next_fn() the former still handles the first function as a special case duplicating the code from the scan loop and splitting the condition that the first function exits from it being multifunction which is tested in next_fn(). Furthermore the non ARI branch of next_fn() mixes the case that multifunction devices may have non-contiguous function ranges and dev may thus be NULL with the multifunction requirement. It also signals that no further functions need to be scanned by returning 0 which is a valid function number. Improve upon this by moving all conditions for having to scan for more functions into next_fn() and make them obvious and commented. By changing next_fn() to return -ENODEV instead of 0 when there is no next function we can then handle the initial function inside the loop and deduplicate the shared handling. No functional change is intended. Signed-off-by: Niklas Schnelle <schnelle@linux.ibm.com> --- drivers/pci/probe.c | 41 +++++++++++++++++++---------------------- 1 file changed, 19 insertions(+), 22 deletions(-)