Skip to contentSkip to conversation

driver core: Add branch prediction hints in really_probe()

PATCH In review Muchun Song 3 participants 6 messages Nov 6, 2018 Driver core

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 driver core: Add branch prediction hints in really_probe()

If condition is false in most cases. So, add an unlikely() to the if condition, so that the optimizer assumes that the condition is false.

---
 drivers/base/dd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/base/dd.c +2 -2
index 169412ee4ae8..8eba453c4e5d 100644
@@ -450,7 +450,7 @@ static int really_probe(struct device *dev, struct device_driver *drv)
 	bool test_remove = IS_ENABLED(CONFIG_DEBUG_TEST_DRIVER_REMOVE) &&
 			   !drv->suppress_bind_attrs;
 
-	if (defer_all_probes) {
+	if (unlikely(defer_all_probes)) {
 		/*
 		 * Value of defer_all_probes can be set only by
 		 * device_defer_all_probes_enable() which, in turn, will call
@@ -508,7 +508,7 @@ static int really_probe(struct device *dev, struct device_driver *drv)
 			goto probe_failed;
 	}
 
-	if (test_remove) {
+	if (unlikely(test_remove)) {
 		test_remove = false;
 
 		if (dev->bus->remove)
Signature · 1 line
2.17.1
#1 lore raw
Quoted 5 lines · Muchun Song

If condition is false in most cases. So, add an unlikely() to the if condition, so that the optimizer assumes that the condition is false.

Have you measured the practical impact of this patch in any way?

Quoted 29 lines
---
 drivers/base/dd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/base/dd.c +2 -3
index 169412ee4ae8..8eba453c4e5d 100644
@@ -450,7 +450,7 @@ static int really_probe(struct device *dev, struct device_driver *drv)
        bool test_remove = IS_ENABLED(CONFIG_DEBUG_TEST_DRIVER_REMOVE) &&
                           !drv->suppress_bind_attrs;
 
-       if (defer_all_probes) {
+       if (unlikely(defer_all_probes)) {
                /*
                 * Value of defer_all_probes can be set only by
                 * device_defer_all_probes_enable() which, in turn, will call
@@ -508,7 +508,7 @@ static int really_probe(struct device *dev, struct device_driver *drv)
                        goto probe_failed;
        }
 
-       if (test_remove) {
+       if (unlikely(test_remove)) {
                test_remove = false;
 
                if (dev->bus->remove)
--

2.17.1

#2 lore raw

Hi Rafael,

If we want the driver core to test driver remove functions, we can enable CONFIG_DEBUG_TEST_DRIVER_REMOVE. This option is
just for testing it. So, in most cases, the option is disabled and the if condition is false. So I think we can add an unlikely() to it.

Quoted 39 lines · Rafael J. Wysocki <[email protected]> 于2018年11月6日周二 下午10:30写道:
Quoted 5 lines · Muchun Song

If condition is false in most cases. So, add an unlikely() to the if condition, so that the optimizer assumes that the condition is false.

Have you measured the practical impact of this patch in any way?

Quoted 29 lines
---
 drivers/base/dd.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
drivers/base/dd.c +2 -3
index 169412ee4ae8..8eba453c4e5d 100644
@@ -450,7 +450,7 @@ static int really_probe(struct device *dev, struct device_driver *drv)
        bool test_remove = IS_ENABLED(CONFIG_DEBUG_TEST_DRIVER_REMOVE) &&
                           !drv->suppress_bind_attrs;
 
-       if (defer_all_probes) {
+       if (unlikely(defer_all_probes)) {
                /*
                 * Value of defer_all_probes can be set only by
                 * device_defer_all_probes_enable() which, in turn, will call
@@ -508,7 +508,7 @@ static int really_probe(struct device *dev, struct device_driver *drv)
                        goto probe_failed;
        }
 
-       if (test_remove) {
+       if (unlikely(test_remove)) {
                test_remove = false;
 
                if (dev->bus->remove)
--

2.17.1

#3 lore raw
Quoted 7 lines · Muchun Song

Hi Rafael,

If we want the driver core to test driver remove functions, we can enable CONFIG_DEBUG_TEST_DRIVER_REMOVE. This option is
just for testing it. So, in most cases, the option is disabled and the if condition is false. So I think we can add an unlikely() to it.

Yes, it can be added there, but does it really need to be added?

If the conditions are false all the time, the branch predictor in the processor should be able to deal with it just fine.

And if they are false already at build time, the compiler should just optimize them away.

#4 lore raw

Hi Rafael,

Quoted 10 lines · Muchun Song
Quoted 7 lines

Hi Rafael,

If we want the driver core to test driver remove functions, we can enable CONFIG_DEBUG_TEST_DRIVER_REMOVE. This option is
just for testing it. So, in most cases, the option is disabled and the if condition is false. So I think we can add an unlikely() to it.

Quoted 7 lines

Yes, it can be added there, but does it really need to be added?

If the conditions are false all the time, the branch predictor in the processor should be able to deal with it just fine.

And if they are false already at build time, the compiler should just optimize them away.

Thank you for your explanation. I really didn't take into account the situation you said. Yeah, the compiler can optimize them away or the processor can deal with it.

So, we don't need to add unlikely() to it. The patch does't make sense. Thanks.

maintainer
#5 lore raw
In reply to Muchun Song
Quoted 4 lines · Muchun Song

If condition is false in most cases. So, add an unlikely() to the if condition, so that the optimizer assumes that the condition is false.

As Rafael said, don't do stuff like this unless you can actually measure the difference. Last time we tested the kernel for this a few years ago, about 75% of the unlikely/likely additions were incorrect, removing them made the kernel faster. Turns out the compiler and cpu know better than developers do :)

Also, the probe() path is never a hot-path to worry about stuff like this.

thanks,

greg k-h