From patchwork Tue Oct 16 18:20:33 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ivan Khoronzhuk X-Patchwork-Id: 148979 Delivered-To: patch@linaro.org Received: by 2002:a2e:8595:0:0:0:0:0 with SMTP id b21-v6csp5435094lji; Tue, 16 Oct 2018 11:20:46 -0700 (PDT) X-Google-Smtp-Source: ACcGV63lHUFsc6qDLNjgWHwoK5Ay2FpPYNql5iO/K9FiVkOEqB51T0FPcKWDmr9pHGxj/kVOTeag X-Received: by 2002:a65:4d03:: with SMTP id i3-v6mr21257299pgt.239.1539714046649; Tue, 16 Oct 2018 11:20:46 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1539714046; cv=none; d=google.com; s=arc-20160816; b=a7IbwgfxyeQ1bEo6QdGrjdxcwZGAkM8OSlv+5mAIBcLTx64n26KXpyFUxl32HMBDnn LkkGlSqIk7+KAC0z/SybSZjgQdYU88viUq0ac6PQMJnM1rTheR/nI/Hu8WS0mCf/67Fl KyqqPjLMi2FtT7aS45YkE9H+BV43PwEeHQLNiP8sHwL0fUaQcrIJLkDB0zlOwgg8ihL+ ch6zL3syKdOHHlr+mOnDqB7KxVPzDMj9BkYt1lj9EIiLa48uc/Rb8hjOEpsDBEJLcMUE z+34B4toF66A49z6nnSzlty6Sirk/9u70xNnZzs6ypGL5E/FBCpMdmtDEaJEbyGp0M36 l5bQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:dkim-signature; bh=qMvp12l9HpDMt+3I+o7Ztx63A+0YQDl6lBkSGcvnOGY=; b=y5SuxP4dxYmTYoYDkswAqBLFQg2RQFFOrGO8aAGdrFB4lMCSOgStj7ZIbV5kMVN9Br 7F5ztNRywDyC+NgxfDwATz5dfn4JYVN7/9Khlh7X/DMX/7uNG6GQE/N0xdLMPuphm4IH 76VvuV7m1XndqWQ8umo7H2cScdER5eEWAOCiTKX3nQ3Mta34lup+R7QVIiWasVJUgrxh sL5fcUy+eb6VNihQ+WJjL1j/vq+WNPqsC1PrYIkagUjgQTPbSl1FNRwJ2UtAPXdktiQg n6mhuAKRHCZaxm6mfRDguoq9mBSqPHWDS8cHdxx3Ve+S1v9B6nALzPR+rOas/Cbm1Fkl 7o9g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Si90Rq1s; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 1-v6si1797097plj.79.2018.10.16.11.20.46; Tue, 16 Oct 2018 11:20:46 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Si90Rq1s; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727593AbeJQCMY (ORCPT + 32 others); Tue, 16 Oct 2018 22:12:24 -0400 Received: from mail-lf1-f67.google.com ([209.85.167.67]:39273 "EHLO mail-lf1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727247AbeJQCMX (ORCPT ); Tue, 16 Oct 2018 22:12:23 -0400 Received: by mail-lf1-f67.google.com with SMTP id n14-v6so5884359lfe.6 for ; Tue, 16 Oct 2018 11:20:42 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=qMvp12l9HpDMt+3I+o7Ztx63A+0YQDl6lBkSGcvnOGY=; b=Si90Rq1sZ31V16S2ywoKtMnwHKjTBjCvpfPLoTDD5pjncIPiQhJaQ5/skVfJEiUwQk /vL4E225IMom3GkKtza2Q2O/P0cfzc60X8dognBpB7GKSv/7RgDmK6CJOAmxmQdDz/Uf BqqNBHmdSq/oMECjFfzpYMndPPbHMYGrM9nfw= 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=qMvp12l9HpDMt+3I+o7Ztx63A+0YQDl6lBkSGcvnOGY=; b=DZnfUsGKwMmItj11dRryN0q7807ZpU3NAFDynO1St895qfBp4AEM/kv1+dWPpup3Mb uD/qeWdKRFQRMG43+5ppBubTuNfv8cqP5ij/QEa2nOLQPWEweLACmKWiudL1yiyqtvL7 RCS9GGpSJrqiOERQmKThatfkRoI1B1ujrJdry3a/QI3XOH9Yci+ts2k1HzfEjQ640VgA 4J3HBtUz8gDbbBCtzSdxXs6+AvU7itL3GZ3hpk8i1bhUbEMcFPp1YjON4zRF7y8wxZOF JQ4Ui+3kWaWg/nJwKiOaIztTUPObS5mMFt0CmV3EPB3Rq6SK4VC21PqL9BYht/GqZirI rxyQ== X-Gm-Message-State: ABuFfoieiMAss2h4daxligXCQSfRDKFO4H3nzdYehkxoVOqLHEyecUcM juwA7JqMMRWFVFKbnFCaE9sCsQ== X-Received: by 2002:a19:480c:: with SMTP id v12-v6mr13279098lfa.46.1539714041252; Tue, 16 Oct 2018 11:20:41 -0700 (PDT) Received: from localhost.localdomain (59-201-94-178.pool.ukrtel.net. [178.94.201.59]) by smtp.gmail.com with ESMTPSA id i27-v6sm3207844lfc.22.2018.10.16.11.20.39 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 16 Oct 2018 11:20:40 -0700 (PDT) From: Ivan Khoronzhuk To: grygorii.strashko@ti.com, davem@davemloft.net Cc: linux-omap@vger.kernel.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org, alexander.h.duyck@intel.com, Ivan Khoronzhuk Subject: [RFC PATCH net-next 2/4] net: 8021q: vlan_core: allow use list of vlans for real device Date: Tue, 16 Oct 2018 21:20:33 +0300 Message-Id: <20181016182035.18234-3-ivan.khoronzhuk@linaro.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20181016182035.18234-1-ivan.khoronzhuk@linaro.org> References: <20181016182035.18234-1-ivan.khoronzhuk@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org It's redundancy for the drivers to hold the list of vlans when absolutely the same list exists in vlan core. In most cases it's needed only to traverse the vlan devices, their vids and sync some settings with h/w, so add API to simplify this. At least some of these drivers also can benefit: grep "for_each.*vid" -r drivers/net/ethernet/ drivers/net/ethernet/hisilicon/hns3/hns3_enet.c: drivers/net/ethernet/synopsys/dwc-xlgmac-hw.c: drivers/net/ethernet/qlogic/qlge/qlge_main.c: drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c: drivers/net/ethernet/via/via-rhine.c: drivers/net/ethernet/via/via-velocity.c: drivers/net/ethernet/intel/igb/igb_main.c: drivers/net/ethernet/intel/ice/ice_main.c: drivers/net/ethernet/intel/e1000/e1000_main.c: drivers/net/ethernet/intel/i40e/i40e_main.c: drivers/net/ethernet/intel/e1000e/netdev.c: drivers/net/ethernet/intel/igbvf/netdev.c: drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c: drivers/net/ethernet/intel/ixgb/ixgb_main.c: drivers/net/ethernet/intel/ixgbe/ixgbe_main.c: drivers/net/ethernet/amd/xgbe/xgbe-dev.c: drivers/net/ethernet/emulex/benet/be_main.c: drivers/net/ethernet/neterion/vxge/vxge-main.c: drivers/net/ethernet/adaptec/starfire.c: drivers/net/ethernet/brocade/bna/bnad.c: Signed-off-by: Ivan Khoronzhuk --- include/linux/if_vlan.h | 10 ++++++++++ net/8021q/vlan_core.c | 27 +++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) -- 2.17.1 diff --git a/include/linux/if_vlan.h b/include/linux/if_vlan.h index 83ea4df6ab81..4ae3993f7166 100644 --- a/include/linux/if_vlan.h +++ b/include/linux/if_vlan.h @@ -133,6 +133,9 @@ struct vlan_pcpu_stats { extern struct net_device *__vlan_find_dev_deep_rcu(struct net_device *real_dev, __be16 vlan_proto, u16 vlan_id); +extern int vlan_for_each(struct net_device *dev, + int (*action)(struct net_device *dev, int vid, + void *arg), void *arg); extern struct net_device *vlan_dev_real_dev(const struct net_device *dev); extern u16 vlan_dev_vlan_id(const struct net_device *dev); extern __be16 vlan_dev_vlan_proto(const struct net_device *dev); @@ -236,6 +239,13 @@ __vlan_find_dev_deep_rcu(struct net_device *real_dev, return NULL; } +static inline int +vlan_for_each(struct net_device *dev, + int (*action)(struct net_device *dev, int vid, void *arg), + void *arg) +{ +} + static inline struct net_device *vlan_dev_real_dev(const struct net_device *dev) { BUG(); diff --git a/net/8021q/vlan_core.c b/net/8021q/vlan_core.c index 4f60e86f4b8d..6308b5427a66 100644 --- a/net/8021q/vlan_core.c +++ b/net/8021q/vlan_core.c @@ -223,6 +223,33 @@ static int vlan_kill_rx_filter_info(struct net_device *dev, __be16 proto, u16 vi return -ENODEV; } +int vlan_for_each(struct net_device *dev, + int (*action)(struct net_device *dev, int vid, void *arg), + void *arg) +{ + struct vlan_vid_info *vid_info; + struct vlan_info *vlan_info; + struct net_device *vdev; + int ret; + + ASSERT_RTNL(); + + vlan_info = rtnl_dereference(dev->vlan_info); + if (!vlan_info) + return 0; + + list_for_each_entry(vid_info, &vlan_info->vid_list, list) { + vdev = vlan_group_get_device(&vlan_info->grp, vid_info->proto, + vid_info->vid); + ret = action(vdev, vid_info->vid, arg); + if (ret) + return ret; + } + + return 0; +} +EXPORT_SYMBOL(vlan_for_each); + int vlan_filter_push_vids(struct vlan_info *vlan_info, __be16 proto) { struct net_device *real_dev = vlan_info->real_dev;