From patchwork Thu Nov 30 22:53:32 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cong Wang X-Patchwork-Id: 843211 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@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; dkim=pass (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="ciC6OIGR"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3ynt4M6sVlz9sMN for ; Fri, 1 Dec 2017 09:53:55 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751111AbdK3Wxw (ORCPT ); Thu, 30 Nov 2017 17:53:52 -0500 Received: from mail-pf0-f196.google.com ([209.85.192.196]:35811 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750747AbdK3Wxv (ORCPT ); Thu, 30 Nov 2017 17:53:51 -0500 Received: by mail-pf0-f196.google.com with SMTP id j124so3768715pfc.2 for ; Thu, 30 Nov 2017 14:53:51 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id; bh=8cnXuGpb0hkgY5wpxp5nZbgN/idAJ8IP1NnmqLynmfY=; b=ciC6OIGRjiZQwbthaxO1JOh3LuWyb0pxuMx7nZCzgXnZMHxQbshZMUex1/mQOyxIVJ bDwgpoH5R/AUfe+CAiahm4DxgOS+vpGPsCxV8LGJ95aH4EBIzDWT5GIE1aT7F4ZfHUu1 FqzLrBqcpHvZFslIgpfWyYxWnn6pCbqA8LS6258Ev0pu5ixcdyfbfPpcmWtwfaPRu7df PIGiN2uKFUW45d4u4ufaMDStfwNks2vRe98zi2xm97K1xhNIryPySfAm3oRDbOO1H5Xy x5QwvJ2pagZS1QEgy1Rpmd4w/lfwJUXrcubRUyr3S7GEohNozR+TAsWYzNj7dPuCpTKu vzjw== 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; bh=8cnXuGpb0hkgY5wpxp5nZbgN/idAJ8IP1NnmqLynmfY=; b=jyKcr+Yaqclf6iENzPHpCTzqkRsQaTCO6ZTc2mbOwWrGJ86hMMi3GdM4qEpdqGvISj UHpTtVUL2mm9QbTphrXk23zjAxhBOXnhb/VdawfBquGZseG4zlqy7/xbwrbPH2dKyvwB jCJkP2zObnIUoZe98tQBfzYRM+dlwuwoZw+G6dFWr6ls7YiGPIPo/he4Fe5HoeOXlcxX vMkTdMvYmQdisCRkDyfjzTQJDypBgSNsi/4iK5VFz6WF7meXSCDeJmoB9dVet1Z0o+YZ XhVAsnIYPvHXYbmtg82wYYruvWbuDbbG76TDldHay21U64IhxgKQYgFQmvBqkH0VE5Vk dJMQ== X-Gm-Message-State: AJaThX7t3bYQwekRj1a5bKhAefEo05SpACivNdVek3BXmvzHQIQRGDrQ 9zaQMy+71I/58PXZvatWa/yLExmU X-Google-Smtp-Source: AGs4zMbT8QIhPGwVzL9c8bPh+W70ZZEZGOGeSCM4Jpz/1/n0jPAPiseRTH8+G1IvpfbBGx/RclezAw== X-Received: by 10.99.127.85 with SMTP id p21mr3848367pgn.425.1512082430790; Thu, 30 Nov 2017 14:53:50 -0800 (PST) Received: from tw-172-25-30-113.office.twttr.net ([8.25.197.25]) by smtp.gmail.com with ESMTPSA id y19sm7845963pgv.19.2017.11.30.14.53.49 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 30 Nov 2017 14:53:49 -0800 (PST) From: Cong Wang To: netdev@vger.kernel.org Cc: Cong Wang , Jiri Pirko , Jamal Hadi Salim Subject: [Patch net-next] act_mirred: use tcfm_dev in tcf_mirred_get_dev() Date: Thu, 30 Nov 2017 14:53:32 -0800 Message-Id: <20171130225335.6957-1-xiyou.wangcong@gmail.com> X-Mailer: git-send-email 2.9.4 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org tcfm_dev always points to the correct netdev and we already hold a refcnt, so no need to use ifindex to lookup again. If we would support moving target netdev across netns, using pointer would be better than ifindex. Cc: Jiri Pirko Cc: Jamal Hadi Salim Signed-off-by: Cong Wang --- include/net/tc_act/tc_mirred.h | 1 - net/sched/act_mirred.c | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/include/net/tc_act/tc_mirred.h b/include/net/tc_act/tc_mirred.h index 21d253c9a8c6..b2dbbfaefd22 100644 --- a/include/net/tc_act/tc_mirred.h +++ b/include/net/tc_act/tc_mirred.h @@ -11,7 +11,6 @@ struct tcf_mirred { int tcfm_ifindex; bool tcfm_mac_header_xmit; struct net_device __rcu *tcfm_dev; - struct net *net; struct list_head tcfm_list; }; #define to_mirred(a) ((struct tcf_mirred *)a) diff --git a/net/sched/act_mirred.c b/net/sched/act_mirred.c index 8b3e59388480..fe6489f9c3cf 100644 --- a/net/sched/act_mirred.c +++ b/net/sched/act_mirred.c @@ -140,7 +140,6 @@ static int tcf_mirred_init(struct net *net, struct nlattr *nla, m->tcfm_eaction = parm->eaction; if (dev != NULL) { m->tcfm_ifindex = parm->ifindex; - m->net = net; if (ret != ACT_P_CREATED) dev_put(rcu_dereference_protected(m->tcfm_dev, 1)); dev_hold(dev); @@ -318,7 +317,7 @@ static struct net_device *tcf_mirred_get_dev(const struct tc_action *a) { struct tcf_mirred *m = to_mirred(a); - return __dev_get_by_index(m->net, m->tcfm_ifindex); + return rtnl_dereference(m->tcfm_dev); } static struct tc_action_ops act_mirred_ops = {