From patchwork Mon Apr 16 15:22:36 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Ahern X-Patchwork-Id: 898725 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="lv3yw+ni"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40PsdJ2xV7z9s3M for ; Tue, 17 Apr 2018 01:25:08 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752332AbeDPPZG (ORCPT ); Mon, 16 Apr 2018 11:25:06 -0400 Received: from mail-pf0-f196.google.com ([209.85.192.196]:32889 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751341AbeDPPXF (ORCPT ); Mon, 16 Apr 2018 11:23:05 -0400 Received: by mail-pf0-f196.google.com with SMTP id f15so10701895pfn.0 for ; Mon, 16 Apr 2018 08:23:04 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=wOfcBa90CBSZJq/9r8hvDpd6q0owATj8eVY3jTOwvl4=; b=lv3yw+niGQU3AJXkmgdTtRYEmivQdg5ABKuSBR1jesFQx/B2F0VH7NhiBe/XfTctmP UQDdLidSWLfhZk5Rx+ijolQ8jJY9z662BKubr1/27s4J+0BeAWKueuLgFoA/YfHNqzSg ekO+THISJ/1Z0ea52lix/jJHXnZ19yX40gDKHN4gR8CGMCefAJMPKtnA9YS30O+psMgk 5NyzVLqvJFCQbtgcjeD/CMVLK+QD1/fwq5Aw44i6sFTGNku8Wxv3no4GL65s9RkXbxAz dkQK4lyZwA86U0csGXID8xynfSAewXVsB2ZNbkXEW4NULnoLxpaoaL+UHXSkDpaS5fhL O+Pw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=wOfcBa90CBSZJq/9r8hvDpd6q0owATj8eVY3jTOwvl4=; b=anJap+heanZBv2E1lcfUYsZGBgolvr1fxPTFeOoFxxtZDUiVfvj+hAu7pvzf7J3D6d xaOqHMopQzLMDiOrn8XZPEqmFTEN2dd6JmvZwNBX/RcuByuIZlOcwyGJwryEoxYHqrff d2RJFsMBB15OaurWy3pQ7fFg90Lv/UxQ2IdKRVSEFhNL32SM7T7WrgPIGSXuQLyF+VcC eKN5QA3svQ+HN65fR5qw6GbPb5rL5cyCxBcMggg2Eh0KSUYSQOdDIMCbAJtSYBeepirx p1I5VYyDLuhW9mSbVKZx23dYWQl5nCeZffhLR72v5tb35qrjaj6L8OM4qGjXlMGJhOgh 32BA== X-Gm-Message-State: ALQs6tCBDSrHPLIhhuFZpEcYj3yvTbZjj7thqGCCk/PLbu8ax8NCGuY2 rUcWNMRKyVq2RvmDtBtrJ6irAg== X-Google-Smtp-Source: AIpwx4+gvwUWlNqnZQDaF4qc8d5F2+7Tw5ZUrQOhuwwWnfhxEvvLyxCSwrvBn0+JuPQrgAAU7Fv2Fw== X-Received: by 10.99.119.195 with SMTP id s186mr10089496pgc.296.1523892184305; Mon, 16 Apr 2018 08:23:04 -0700 (PDT) Received: from kenny.it.cumulusnetworks.com. (fw.cumulusnetworks.com. [216.129.126.126]) by smtp.googlemail.com with ESMTPSA id r82sm4919437pfk.187.2018.04.16.08.23.02 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 16 Apr 2018 08:23:03 -0700 (PDT) From: David Ahern To: netdev@vger.kernel.org Cc: davem@davemloft.net, idosch@idosch.org, roopa@cumulusnetworks.com, eric.dumazet@gmail.com, weiwan@google.com, kafai@fb.com, yoshfuji@linux-ipv6.org, David Ahern Subject: [PATCH net-next 02/21] net: Handle null dst in rtnl_put_cacheinfo Date: Mon, 16 Apr 2018 08:22:36 -0700 Message-Id: <20180416152255.2256-3-dsahern@gmail.com> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20180416152255.2256-1-dsahern@gmail.com> References: <20180416152255.2256-1-dsahern@gmail.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Need to keep expires time for IPv6 routes in a dump of FIB entries. Update rtnl_put_cacheinfo to allow dst to be NULL in which case rta_cacheinfo will only contain non-dst data. Signed-off-by: David Ahern --- net/core/rtnetlink.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/net/core/rtnetlink.c b/net/core/rtnetlink.c index 45936922d7e2..80802546c279 100644 --- a/net/core/rtnetlink.c +++ b/net/core/rtnetlink.c @@ -785,13 +785,15 @@ int rtnl_put_cacheinfo(struct sk_buff *skb, struct dst_entry *dst, u32 id, long expires, u32 error) { struct rta_cacheinfo ci = { - .rta_lastuse = jiffies_delta_to_clock_t(jiffies - dst->lastuse), - .rta_used = dst->__use, - .rta_clntref = atomic_read(&(dst->__refcnt)), .rta_error = error, .rta_id = id, }; + if (dst) { + ci.rta_lastuse = jiffies_delta_to_clock_t(jiffies - dst->lastuse); + ci.rta_used = dst->__use; + ci.rta_clntref = atomic_read(&dst->__refcnt); + } if (expires) { unsigned long clock;