Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.9 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 74880C10F11 for ; Wed, 10 Apr 2019 15:44:35 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 42CFD20854 for ; Wed, 10 Apr 2019 15:44:35 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="uhEtdUC2" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730796AbfDJPoe (ORCPT ); Wed, 10 Apr 2019 11:44:34 -0400 Received: from mail-pl1-f196.google.com ([209.85.214.196]:32850 "EHLO mail-pl1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730770AbfDJPod (ORCPT ); Wed, 10 Apr 2019 11:44:33 -0400 Received: by mail-pl1-f196.google.com with SMTP id t16so1680184plo.0 for ; Wed, 10 Apr 2019 08:44:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=subject:to:cc:references:from:message-id:date:user-agent :mime-version:in-reply-to:content-language:content-transfer-encoding; bh=I1KxQC0fagm+5RkDSLXF/q6O48MHd9720ecXMTmqHZ8=; b=uhEtdUC23Zz2jMVjrDAyCXrgIIny6fL9p0fSrIuj6fyQ+lBhmQ9w7zjKkm2VJ5+aeT MowIQrj2PY9U6yE8Fqvp49jbR81wiehNnyJPBcjganxrlgWCAIFWE2cj3QWODLyGkm59 xIO9HL3BbrripPWwt492uyeSf6Ym+dL1urPeofCZA7mlvSF/kvePfbHJbtcBxVYjGq9N DxgEaF6QOrfPGwk/OHePGgGpAc6Lf2EqDW+p2Agqbm6TTibg8+vjI31d/AN+cdY6suD+ VfVREcbq1x53BJs5bj1K5URN3I0WUULwIdbAJzhWUlbx9FIXBds4gyI0VRN6VNFyChff bmaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:subject:to:cc:references:from:message-id:date :user-agent:mime-version:in-reply-to:content-language :content-transfer-encoding; bh=I1KxQC0fagm+5RkDSLXF/q6O48MHd9720ecXMTmqHZ8=; b=WZI0TzOa2ok9R7V9WE7mwJythuUEzZYEs2u0UW6ah35cqdRjDk2aGcJ9deSgAyVoCt 4ZVKp4mk8uVlScLsNmEdSM02kROGcbKOKkcYIDrSv5nX18CpC4WTOqq2ADXZ88A9iL6R Ug2dZTiKuf+ToW1FKn7JWxib9n6UtboZZZXm9ZmbdPoWBllg4yh9L14zfUrujFb9vU+J sSrnuTaNNr/dcIY83+vyHK9gvKQN0VCb4oklzlJTqUh5pJBLkw1lvtgnAmIm7YICPR7N 4oMTvBxvYMVbS23jqVKaFsd/aOnNsOEHNRbtJ4eEf1LgJQGvI3ly2SAFkHaIjYp47IDV 1Mjw== X-Gm-Message-State: APjAAAVzHpjf5OTLz1n01/GkxfGFOZZOb4nfs+qcUr17EHUKoDJNa8lG nxrpPFO1pMR6eEYC/Oe7itoTrD6/ X-Google-Smtp-Source: APXvYqyO8eJ82/U2HEZGUNlweAYkh9CMf6JJFkEK6raWj2AtWrJlFVkkQfUiGGZnl33VZ/LHGF0Rtw== X-Received: by 2002:a17:902:1486:: with SMTP id k6mr10365592pla.208.1554911072527; Wed, 10 Apr 2019 08:44:32 -0700 (PDT) Received: from [10.40.10.244] (fw.cumulusnetworks.com. [216.129.126.126]) by smtp.googlemail.com with ESMTPSA id p7sm15143097pgb.58.2019.04.10.08.44.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 10 Apr 2019 08:44:31 -0700 (PDT) Subject: Re: [PATCH v2 net-next 08/18] ipv4: Refactor fib_check_nh To: Govindarajulu Varadarajan Cc: David Ahern , davem@davemloft.net, netdev@vger.kernel.org, idosch@mellanox.com, jiri@mellanox.com, benve@cisco.com References: <20190405233041.30775-1-dsahern@kernel.org> <20190405233041.30775-9-dsahern@kernel.org> From: David Ahern Message-ID: <663e0441-cd19-abb3-cfd9-8663e0462863@gmail.com> Date: Wed, 10 Apr 2019 08:44:28 -0700 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.14; rv:52.0) Gecko/20100101 Thunderbird/52.9.1 MIME-Version: 1.0 In-Reply-To: Content-Type: text/plain; charset=utf-8 Content-Language: en-US Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org On 4/9/19 10:31 PM, Govindarajulu Varadarajan wrote: > However this worked > > @@ -1096,7 +1096,7 @@ static int fib_check_nh(struct fib_config *cfg, > struct fib_nh *nh, > u32 table = cfg->fc_table; > int err; > > - if (nh->fib_nh_gw_family == AF_INET) > + if (nh->fib_nh_gw4) > err = fib_check_nh_v4_gw(net, nh, table, cfg->fc_scope, extack); > else if (nh->fib_nh_gw_family == AF_INET6) > err = fib_check_nh_v6_gw(net, nh, table, extack); > since fib_nh_gw4 is a union that cannot be used without checking the family first. You need this part as well (previous hunk was for mpath routes): diff --git a/net/ipv4/fib_frontend.c b/net/ipv4/fib_frontend.c index 310060e67790..d4b63f94f7be 100644 --- a/net/ipv4/fib_frontend.c +++ b/net/ipv4/fib_frontend.c @@ -755,8 +755,9 @@ static int rtm_to_fib_config(struct net *net, struct sk_buff *skb, break; case RTA_GATEWAY: has_gw = true; - cfg->fc_gw_family = AF_INET; cfg->fc_gw4 = nla_get_be32(attr); + if (cfg->fc_gw4) + cfg->fc_gw_family = AF_INET; break; case RTA_VIA: has_via = true;