Skip to contentSkip to conversation

fix invalid frontend path for set_mtu

PATCH In review James Dingwall 2 participants 6 messages Mar 1, 2022 – Apr 27, 2022

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 fix invalid frontend path for set_mtu

Hi,

The set_mtu() function of xen-network-common.sh currently has this code:

        if [ ${type_if} = vif ]
        then
            local dev_=${dev#vif}
            local domid=${dev_%.*}
            local devid=${dev_#*.}

            local FRONTEND_PATH="/local/domain/$domid/device/vif/$devid"

            xenstore_write "$FRONTEND_PATH/mtu" ${mtu}
        fi

This works fine if the device has its default name but if the xen config defines the vifname parameter the FRONTEND_PATH is incorrectly constructed. Learn the frontend path by reading the appropriate value from the backend.

tools/hotplug/Linux/xen-network-common.sh +1 -5
index 02e2388600..cd98f0d486 100644
@@ -163,11 +163,7 @@ set_mtu () {
 
         if [ ${type_if} = vif ]
         then
-            local dev_=${dev#vif}
-            local domid=${dev_%.*}
-            local devid=${dev_#*.}
-
-            local FRONTEND_PATH="/local/domain/$domid/device/vif/$devid"
+            local FRONTEND_PATH=$(xenstore_read "$XENBUS_PATH/frontend")
 
             xenstore_write "$FRONTEND_PATH/mtu" ${mtu}
         fi

Thanks,
James

#1 lore raw

Hi James,

Quoted 13 lines · James Dingwall

The set_mtu() function of xen-network-common.sh currently has this code:

        if [ ${type_if} = vif ]
        then
            local dev_=${dev#vif}
            local domid=${dev_%.*}
            local devid=${dev_#*.}

            local FRONTEND_PATH="/local/domain/$domid/device/vif/$devid"

            xenstore_write "$FRONTEND_PATH/mtu" ${mtu}
        fi
Quoted 3 lines

This works fine if the device has its default name but if the xen config defines the vifname parameter the FRONTEND_PATH is incorrectly constructed. Learn the frontend path by reading the appropriate value from the backend.

The patch looks fine, thanks. It is only missing a line "Signed-off-by: your_name <your_email>" at the end of the description. The meaning of this line is described in the file CONTRIBUTING, section "Developer's Certificate of Origin".

Thanks,

Signature · 1 line
Anthony PERARD
#2 lore raw

Hi Anthony,

Quoted 16 lines · Anthony PERARD

Hi James,

Quoted 13 lines · James Dingwall

The set_mtu() function of xen-network-common.sh currently has this code:

        if [ ${type_if} = vif ]
        then
            local dev_=${dev#vif}
            local domid=${dev_%.*}
            local devid=${dev_#*.}

            local FRONTEND_PATH="/local/domain/$domid/device/vif/$devid"

            xenstore_write "$FRONTEND_PATH/mtu" ${mtu}
        fi
Quoted 9 lines
Quoted 3 lines

This works fine if the device has its default name but if the xen config defines the vifname parameter the FRONTEND_PATH is incorrectly constructed. Learn the frontend path by reading the appropriate value from the backend.

The patch looks fine, thanks. It is only missing a line "Signed-off-by: your_name <your_email>" at the end of the description. The meaning of this line is described in the file CONTRIBUTING, section "Developer's Certificate of Origin".

Thank you for your feedback. I've updated the patch as suggested. I've also incorporated two other changes, one is a simple style change for consistency, the other is to change a the test for a valid mtu from > 0 to >= 68. I can resubmit the original patch if either of these are a problem.

Thanks,
James

commit 03ad5670f8a7402e30b288a55d088e87685cd1a1

Author: James Dingwall <[email protected]>
Date:   Tue Apr 19 12:45:31 2022 +0100

The set_mtu() function of xen-network-common.sh currently has this code:

if [ ${type_if} = vif ]
then
local dev_=${dev#vif}
local domid=${dev_%.*}
local devid=${dev_#*.}

local FRONTEND_PATH="/local/domain/$domid/device/vif/$devid"

xenstore_write "$FRONTEND_PATH/mtu" ${mtu}
fi

This works fine if the device has its default name but if the xen config defines the vifname parameter the FRONTEND_PATH is incorrectly constructed. Learn the frontend path by reading the appropriate value from the backend.

Also change use of ... to $(...) for a consistent style in the script and adjust the valid check from mtu > 0 to mtu >= 68 per RFC 791.

tools/hotplug/Linux/xen-network-common.sh +3 -7
index 42fa704e8d..9a382c39f4 100644
@@ -171,24 +171,20 @@ set_mtu () {
     local mtu=$(xenstore_read_default "$XENBUS_PATH/mtu" "")
     if [ -z "$mtu" ]
     then
-        mtu="`ip link show dev ${bridge}| awk '/mtu/ { print $5 }'`"
+        mtu="$(ip link show dev ${bridge}| awk '/mtu/ { print $5 }')"
         if [ -n "$mtu" ]
         then
             log debug "$bridge MTU is $mtu"
         fi
     fi
-    if [ -n "$mtu" ] && [ "$mtu" -gt 0 ]
+    if [ -n "$mtu" ] && [ "$mtu" -ge 68 ]
     then
         log debug "setting $dev MTU to $mtu"
         ip link set dev ${dev} mtu ${mtu} || :
 
         if [ ${type_if} = vif ]
         then
-            local dev_=${dev#vif}
-            local domid=${dev_%.*}
-            local devid=${dev_#*.}
-
-            local FRONTEND_PATH="/local/domain/$domid/device/vif/$devid"
+            local FRONTEND_PATH="$(xenstore_read "$XENBUS_PATH/frontend")"
 
             xenstore_write "$FRONTEND_PATH/mtu" ${mtu}
         fi
#3 lore raw
Quoted 4 lines · James Dingwall

Thank you for your feedback. I've updated the patch as suggested. I've also incorporated two other changes, one is a simple style change for consistency, the other is to change a the test for a valid mtu from > 0 to >= 68. I can resubmit the original patch if either of these are a problem.

The style change is fine, but I'd rather have the change to the mtu check in a different patch.

Otherwise, the patch looks better, thanks.

Signature · 1 line
Anthony PERARD
#4 lore raw
Quoted 10 lines · Anthony PERARD
Quoted 4 lines · James Dingwall

Thank you for your feedback. I've updated the patch as suggested. I've also incorporated two other changes, one is a simple style change for consistency, the other is to change a the test for a valid mtu from > 0 to >= 68. I can resubmit the original patch if either of these are a problem.

The style change is fine, but I'd rather have the change to the mtu check in a different patch.

Otherwise, the patch looks better, thanks.

Here is a revised version of the patch that removes the mtu change.

Thanks,
James

commit f6ec92717522e74b4cc3aa4160b8ad6884e0b50c

Author: James Dingwall <[email protected]>
Date:   Tue Apr 19 12:45:31 2022 +0100
    The set_mtu() function of xen-network-common.sh currently has this code:
    
            if [ ${type_if} = vif ]
            then
                local dev_=${dev#vif}
                local domid=${dev_%.*}
                local devid=${dev_#*.}
    
                local FRONTEND_PATH="/local/domain/$domid/device/vif/$devid"
    
                xenstore_write "$FRONTEND_PATH/mtu" ${mtu}
            fi
    
    This works fine if the device has its default name but if the xen config
    defines the vifname parameter the FRONTEND_PATH is incorrectly constructed.
    Learn the frontend path by reading the appropriate value from the backend.
    
    Also change use of `...` to $(...) for a consistent style in the script.
    
    Signed-off-by: James Dingwall <[email protected]>
tools/hotplug/Linux/xen-network-common.sh +2 -6
index 42fa704e8d..7a63308a9e 100644
@@ -171,7 +171,7 @@ set_mtu () {
     local mtu=$(xenstore_read_default "$XENBUS_PATH/mtu" "")
     if [ -z "$mtu" ]
     then
-        mtu="`ip link show dev ${bridge}| awk '/mtu/ { print $5 }'`"
+        mtu="$(ip link show dev ${bridge}| awk '/mtu/ { print $5 }')"
         if [ -n "$mtu" ]
         then
             log debug "$bridge MTU is $mtu"
@@ -184,11 +184,7 @@ set_mtu () {
 
         if [ ${type_if} = vif ]
         then
-            local dev_=${dev#vif}
-            local domid=${dev_%.*}
-            local devid=${dev_#*.}
-
-            local FRONTEND_PATH="/local/domain/$domid/device/vif/$devid"
+            local FRONTEND_PATH="$(xenstore_read "$XENBUS_PATH/frontend")"
 
             xenstore_write "$FRONTEND_PATH/mtu" ${mtu}
         fi
Reviewed-by
#5 lore raw
Quoted 17 lines · James Dingwall

commit f6ec92717522e74b4cc3aa4160b8ad6884e0b50c

Author: James Dingwall <[email protected]>
Date:   Tue Apr 19 12:45:31 2022 +0100
    The set_mtu() function of xen-network-common.sh currently has this code:
    
            if [ ${type_if} = vif ]
            then
                local dev_=${dev#vif}
                local domid=${dev_%.*}
                local devid=${dev_#*.}
    
                local FRONTEND_PATH="/local/domain/$domid/device/vif/$devid"
    
                xenstore_write "$FRONTEND_PATH/mtu" ${mtu}
            fi
Quoted 7 lines
    This works fine if the device has its default name but if the xen config
    defines the vifname parameter the FRONTEND_PATH is incorrectly constructed.
    Learn the frontend path by reading the appropriate value from the backend.
    
    Also change use of `...` to $(...) for a consistent style in the script.
    
    Signed-off-by: James Dingwall <[email protected]>

Thanks!

Quoted 26 lines
tools/hotplug/Linux/xen-network-common.sh +2 -6
index 42fa704e8d..7a63308a9e 100644
@@ -171,7 +171,7 @@ set_mtu () {
     local mtu=$(xenstore_read_default "$XENBUS_PATH/mtu" "")
     if [ -z "$mtu" ]
     then
-        mtu="`ip link show dev ${bridge}| awk '/mtu/ { print $5 }'`"
+        mtu="$(ip link show dev ${bridge}| awk '/mtu/ { print $5 }')"
         if [ -n "$mtu" ]
         then
             log debug "$bridge MTU is $mtu"
@@ -184,11 +184,7 @@ set_mtu () {
 
         if [ ${type_if} = vif ]
         then
-            local dev_=${dev#vif}
-            local domid=${dev_%.*}
-            local devid=${dev_#*.}
-
-            local FRONTEND_PATH="/local/domain/$domid/device/vif/$devid"
+            local FRONTEND_PATH="$(xenstore_read "$XENBUS_PATH/frontend")"
 
             xenstore_write "$FRONTEND_PATH/mtu" ${mtu}
         fi
Signature · 1 line
Anthony PERARD