Re: [UNIKRAFT PATCH v3 2/2] lib/uknetdev: Get the ipaddr, gw_addr and subnet

[Simon Kuenzer <simon.kuenzer@xxxxxxxxx>]

On 08.07.20, 17:06, "Minios-devel on behalf of Sharan Santhanam" 
<minios-devel-bounces@xxxxxxxxxxxxxxxxxxxx on behalf of 
Sharan.Santhanam@xxxxxxxxx> wrote:

    The user of uknetdev can pass the ipaddr, gw_addr and subnet as a
    library argument. The library argument can be retrieved from the
    network stack using uk_netdev_einfo_get function. The library
    arguments are retrieved only if the driver does not support the
    uk_netdev_einfo_get callback.

I would overwrite the driver values with the kernel command line - so changing 
the priority. I think we have a similar behavior with Linux guests on Xen. IP 
address settings through xen tore are ignored when the kernel command line has 
different addresses, right? I would try to be inline with that behavior.
    
    Signed-off-by: Sharan Santhanam <sharan.santhanam@xxxxxxxxx>
    ---
     lib/uknetdev/netdev.c | 24 ++++++++++++++++++++++++
     1 file changed, 24 insertions(+)
    
    diff --git a/lib/uknetdev/netdev.c b/lib/uknetdev/netdev.c
    index e0ee4427..23581f50 100644
    --- a/lib/uknetdev/netdev.c
    +++ b/lib/uknetdev/netdev.c
    @@ -239,6 +239,28 @@ void uk_netdev_info_get(struct uk_netdev *dev,
                                      dev_info->max_tx_queues);
     }
     
    +static const void *_netdev_einfo_get(struct uk_netdev *dev,
    +                           enum uk_netdev_einfo_type einfo)
    +{
    +   switch (einfo) {
    +   case UK_NETDEV_IPV4_ADDR_STR:
    +           if (dev->_config->ipv4_addr)
    +                   uk_pr_debug("ip_addr: %s\n", dev->_config->ipv4_addr);
    +           return dev->_config->ipv4_addr;
    +   case UK_NETDEV_IPV4_MASK_STR:
    +           if (dev->_config->ipv4_net_mask)
    +                   uk_pr_debug("netmask: %s\n", 
dev->_config->ipv4_net_mask);
    +           return dev->_config->ipv4_net_mask;
    +   case UK_NETDEV_IPV4_GW_STR:
    +           if (dev->_config->ipv4_gw_addr)
    +                   uk_pr_debug("Gateway: %s\n", 
dev->_config->ipv4_gw_addr);
    +           return dev->_config->ipv4_gw_addr;
    +   default:
    +           uk_pr_warn("Option %d not yet supported\n", einfo);
    +   }
    +   return NULL;
    +}
    +
     const void *uk_netdev_einfo_get(struct uk_netdev *dev,
                                enum uk_netdev_einfo_type einfo)
     {
    @@ -247,6 +269,8 @@ const void *uk_netdev_einfo_get(struct uk_netdev *dev,
     
        if (!dev->ops->einfo_get) {
                /* driver does not provide any extra configuration */
    +           if (dev->_config)
    +                   return _netdev_einfo_get(dev, einfo);
                return NULL;
        }
        return dev->ops->einfo_get(dev, einfo);
    -- 
    2.20.1