Skip to contentSkip to conversation

tools/hotpug: only attempt to call 'ip route' if there is valid command

PATCH Superseded [email protected] 3 participants 3 messages Oct 24, 2019 – Oct 28, 2019

v1 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 tools/hotpug: only attempt to call 'ip route' if there is valid command

From: Paul Durrant <[email protected]>

The vif-route script should only call 'ip route' when 'ipcmd' has been set, otherwise it will fail due to an incorrect command string.

---
Cc: Ian Jackson <[email protected]>
Cc: Wei Liu <[email protected]>

This appears to have been broken forever.

---
 tools/hotplug/Linux/vif-route | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/hotplug/Linux/vif-route +1 -1
index c149ffca73..98893d90b6 100644
@@ -35,7 +35,7 @@ case "${command}" in
         ;;
 esac
 
-if [ "${ip}" ] ; then
+if [ "${ipcmd}" ] ; then
     # If we've been given a list of IP addresses, then add routes from dom0 to
     # the guest using those addresses.
     for addr in ${ip} ; do
Signature · 7 lines
2.17.1


_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
#1 lore raw
Quoted 11 lines · On Thu, Oct 24, 2019 at 03:21:03PM +0100, [email protected] wrote:

From: Paul Durrant <[email protected]>

The vif-route script should only call 'ip route' when 'ipcmd' has been set, otherwise it will fail due to an incorrect command string.

---
Cc: Ian Jackson <[email protected]>
Cc: Wei Liu <[email protected]>

This appears to have been broken forever.

Or probably since c0efb8dc852805fd4d3c2691aca1f6c52f6b6ac7, 13 years ago.

Quoted 9 lines
---
 tools/hotplug/Linux/vif-route | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/hotplug/Linux/vif-route +0 -0
index c149ffca73..98893d90b6 100644

tools/hotplug/Linux/vif-route case "${command}" in · line 38

Quoted 5 lines
tools/hotplug/Linux/vif-route +1 -1
@@ -35,7 +35,7 @@ case "${command}" in
         ;;
 esac
 
-if [ "${ip}" ] ; then
+if [ "${ipcmd}" ] ; then

The commit message and this new condition doesn't really explain what is happening.
Does that means we only need to run ip route when command is 'online' or 'offline'? Is there something else to do 'add' and 'remove'?

Could you add something in the commit message, and maybe a comment?

Thanks,

Signature · 6 lines
Anthony PERARD

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel
#2 lore raw
Quoted 12 lines · Anthony PERARD
Quoted 10 lines · On Thu, Oct 24, 2019 at 03:21:03PM +0100, [email protected] wrote:

From: Paul Durrant <[email protected]>

The vif-route script should only call 'ip route' when 'ipcmd' has been set, otherwise it will fail due to an incorrect command string.

---
Cc: Ian Jackson <[email protected]>
Cc: Wei Liu <[email protected]>

Quoted 5 lines
Quoted 1 line

This appears to have been broken forever.

Or probably since c0efb8dc852805fd4d3c2691aca1f6c52f6b6ac7, 13 years ago.

Maybe. The heritage is not all that clear.

Quoted 12 lines
Quoted 12 lines
---
 tools/hotplug/Linux/vif-route | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
tools/hotplug/Linux/vif-route +0 -0
index c149ffca73..98893d90b6 100644
@@ -35,7 +35,7 @@ case "${command}" in
         ;;
 esac
 
Quoted 5 lines

tools/hotplug/Linux/vif-route case "${command}" in · line 38

Quoted 2 lines
tools/hotplug/Linux/vif-route +1 -1
-if [ "${ip}" ] ; then
+if [ "${ipcmd}" ] ; then

The commit message and this new condition doesn't really explain what is happening.

It kind of does, but maybe not with the standard context. Looking at the whole file it does appear to be the intention that the clause is only invoked when ipcmd is set, and it was probably typoed. I can add some more explanation though.

Quoted 3 lines

Does that means we only need to run ip route when command is 'online' or 'offline'? Is there something else to do 'add' and 'remove'?

Empirically online/offline appear to be used for PV interfaces and add/remove for emulated interfaces. I do actually have a newer version of the script now that adds a route metric and handles add/remove such that the emulated interface gets a higher priority... so it is used until the guest triggers an unplug. I need to do some more testing and I'll send that as v2 once I'm done.

Cheers,

Paul

_______________________________________________
Xen-devel mailing list
[email protected]
https://lists.xenproject.org/mailman/listinfo/xen-devel