From mboxrd@z Thu Jan 1 00:00:00 1970 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.8 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 DED29C43381 for ; Mon, 1 Apr 2019 18:47:22 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id A54652086C for ; Mon, 1 Apr 2019 18:47:22 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="YJsiuHkU" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728877AbfDASrV (ORCPT ); Mon, 1 Apr 2019 14:47:21 -0400 Received: from mail-pg1-f193.google.com ([209.85.215.193]:40636 "EHLO mail-pg1-f193.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728690AbfDASrU (ORCPT ); Mon, 1 Apr 2019 14:47:20 -0400 Received: by mail-pg1-f193.google.com with SMTP id u9so5201809pgo.7 for ; Mon, 01 Apr 2019 11:47:20 -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=IgsNcjPP4kZoHiRLTMxaHbv3wMDyQIzFXqKiHDF6+BQ=; b=YJsiuHkUNvgvOTcCXjiysuyHV2uIDE8wAUrPv3wi8CWFu5M0WGxkMLWRW2JxlRuPxA 5YXE1ENQbMV3wuhlhVQ6/SVen6TUNaVqUWmfr6VEPFuOOLca0YlDea0mYXnoB5R7cLZa nCYCZl/1F6nsoksSx9DpLUX4cf0PthK9LWc6WXEqq//MMetNWX2biA1/EA0tpSCuOyl8 9c5pGmzyJj5Cpyd+UeVU/cCl1eVPZz5YOibeoGSKmqyIkF8bi7SgmDF1VtMBnb10wNHG KlYyeYdLtUQf+dS8QrQGXFlV+HaU/7hj8xSqWobrfrJANhbcd10dN5OfBFCibEdxBD3a 2h9w== 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=IgsNcjPP4kZoHiRLTMxaHbv3wMDyQIzFXqKiHDF6+BQ=; b=PuKd30btvbI5sc886jfVNkb2vPtvtQJ2eQ2XPPN+zJmaLPYH3Tb7Uz0wvHktX/Ovnn 3e3W0WsfDjOudXUDcmHh3/CD+6mPr6AVqc6cN4qF2Y2ry8sajfBEsj/+898BkT1tJnPB Urn4UCQUxxIp7Q3TBScwNx+H8qMFANhTeGcPMQCNnD578tPKW00bmpByPI2SwuhMHEUC GgZv4H2uF1QQCS2cGvg4vHrcnjEV+zhzH9Mdi2uz6h6QzaV7GOisid4uyQxWEkPVDV7K lcZI0yVa+T5E4m6PuRzqPns/4uS4x8F74t4KnxSBPdtxrSlMSMUxrVuz3wkfFlVotRNn pEjg== X-Gm-Message-State: APjAAAVBeU3rnC7fwgc4/tgiOYZshJTlzZkgjLDFYTM4hjSEVEaL0W8b 6ia4LzQngoUxB9aaPFNUx7Y= X-Google-Smtp-Source: APXvYqzSbagqGwN7Uia9TnUwJ39xE0ZRJnxyPj8iS2kSGZ0qfdAlmwh9i7uvQbwPwnu2FhIqrLl1Cw== X-Received: by 2002:a62:19c3:: with SMTP id 186mr63116855pfz.172.1554144440073; Mon, 01 Apr 2019 11:47:20 -0700 (PDT) Received: from ?IPv6:2601:282:800:fd80:e4e1:a8b:a839:26ca? ([2601:282:800:fd80:e4e1:a8b:a839:26ca]) by smtp.googlemail.com with ESMTPSA id f3sm15347974pfn.100.2019.04.01.11.47.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 01 Apr 2019 11:47:19 -0700 (PDT) Subject: Re: [PATCH v2 net-next 2/5] ipv4: Add fib_nh_common to fib_result To: Martin Lau , David Ahern Cc: "davem@davemloft.net" , "netdev@vger.kernel.org" , "idosch@mellanox.com" References: <20190401162603.26914-1-dsahern@kernel.org> <20190401162603.26914-3-dsahern@kernel.org> <20190401182033.khnhgfphfn3rptb4@kafai-mbp.dhcp.thefacebook.com> From: David Ahern Message-ID: <1c7ae34e-db63-a834-6623-1170ec8899a7@gmail.com> Date: Mon, 1 Apr 2019 12:47:17 -0600 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: <20190401182033.khnhgfphfn3rptb4@kafai-mbp.dhcp.thefacebook.com> 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/1/19 12:20 PM, Martin Lau wrote: >> diff --git a/include/net/ip_fib.h b/include/net/ip_fib.h >> index 12a6d759cf57..5070bc531ca4 100644 >> --- a/include/net/ip_fib.h >> +++ b/include/net/ip_fib.h >> @@ -156,15 +156,16 @@ struct fib_rule; >> >> struct fib_table; >> struct fib_result { >> - __be32 prefix; >> - unsigned char prefixlen; >> - unsigned char nh_sel; >> - unsigned char type; >> - unsigned char scope; >> - u32 tclassid; >> - struct fib_info *fi; >> - struct fib_table *table; >> - struct hlist_head *fa_head; >> + __be32 prefix; >> + unsigned char prefixlen; >> + unsigned char nh_sel; > Is nh_sel still needed? yes, for fib_result_nl API and nl_fib_lookup. >> diff --git a/net/ipv4/fib_semantics.c b/net/ipv4/fib_semantics.c >> index df777af7e278..f81c7dc7ff59 100644 >> --- a/net/ipv4/fib_semantics.c >> +++ b/net/ipv4/fib_semantics.c >> @@ -1075,6 +1075,24 @@ __be32 fib_info_update_nh_saddr(struct net *net, struct fib_nh *nh) >> return nh->nh_saddr; >> } >> >> +__be32 fib_result_prefsrc(struct net *net, struct fib_result *res) >> +{ >> + struct fib_nh_common *nhc = res->nhc; >> + struct fib_nh *nh; >> + >> + if (res->fi->fib_prefsrc) >> + return res->fi->fib_prefsrc; >> + >> + if (unlikely(nhc->nhc_family != AF_INET)) > Comparing with FIB_RES_PREFSRC, it is not immediately obvious > why this test is needed. May be a comment or a commit log message? This branch is for the case of v6 with v4. I can remove from this patch and add later. Right now, nhc will only be from a fib_nh. > >> + return inet_select_addr(nhc->nhc_dev, 0, res->fi->fib_scope); >> + >> + nh = container_of(nhc, struct fib_nh, nh_common); >> + if (nh->nh_saddr_genid == atomic_read(&net->ipv4.dev_addr_genid)) >> + return nh->nh_saddr; >> + >> + return fib_info_update_nh_saddr(net, nh); >> +} >> + >> static bool fib_valid_prefsrc(struct fib_config *cfg, __be32 fib_prefsrc) >> { >> if (cfg->fc_type != RTN_LOCAL || !cfg->fc_dst || >> @@ -1762,20 +1780,22 @@ void fib_select_multipath(struct fib_result *res, int hash) >> struct net *net = fi->fib_net; >> bool first = false; >> >> - for_nexthops(fi) { >> + change_nexthops(fi) { > Is it mainly because of the 'const'? yes.