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=-9.0 required=3.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT 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 8C4FEC282DD for ; Thu, 18 Apr 2019 14:06:52 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 5DADF2083D for ; Thu, 18 Apr 2019 14:06:52 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=resnulli-us.20150623.gappssmtp.com header.i=@resnulli-us.20150623.gappssmtp.com header.b="1crFTPeC" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2389421AbfDROGv (ORCPT ); Thu, 18 Apr 2019 10:06:51 -0400 Received: from mail-wm1-f67.google.com ([209.85.128.67]:50658 "EHLO mail-wm1-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2389354AbfDROGc (ORCPT ); Thu, 18 Apr 2019 10:06:32 -0400 Received: by mail-wm1-f67.google.com with SMTP id z11so2960037wmi.0 for ; Thu, 18 Apr 2019 07:06:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=hi4YdwwfHmeM1PoZqz4w6hXVEnuMXzQv3f+ROheKEX0=; b=1crFTPeC4CoxhJlpabgYHEzTCt1aD8eHT2LLYeqr3UMTtfjc/CRg5TiJI4w1spHqCc AJXnv4aekzaAcul3pD7wrke5SHhzyd/3QiI48J5yQf/NrQU7b6Gb1XB5UlZQHwKktZIl oefbsDAkL0cgYQNF7s4FIsSdER1AWkN+96ZwVQ6aSLFAvFN8mbLTOZBoL0Mm2QetOQPf iLFIqz3DiqiCpp0BfkNqGxaXqRMOMRwxH5IpXUBMHcRIw2pvgCVicDoZ3D7/2Mmh3Ggg krAqcTZ8lITYP+vOD4S7Iipb3PAebYijT8yK1MMgmCh27cxm2AuYkJJirZBP79XcM6Ds IX5g== 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=hi4YdwwfHmeM1PoZqz4w6hXVEnuMXzQv3f+ROheKEX0=; b=OO7yIrppNbwLnJzqK17AwYT7LNE7kl+t24Wh3Lxj/EfQpu852vwOyScB8qpc2RZkKF 09z07ZTIvhr8hcGol777CcXHNDYnGXjx2sOgBdgUNvEZZGh27jbmdS8N9EKgjXEOGpy6 VdvRBK4EX4kkwKXNHn/Drno21EljFuqRs4FrJGaG61/n97+bu2JZiGL8DwoRhIQm26WH ns7l/9qHbNoWVdqcxSVGjkf3O+KDEBJB0MQxsmHPbCNcrSSzq/3nupf3nrtloCdR6N75 gRIz5jx+61fuldXEr2nwhMGcrOXLOEWz4rKIQruIAC8sCKIPX1uF63L2wB7ViDuNsCq7 rZXQ== X-Gm-Message-State: APjAAAVkEvjHfAOyJuhNPdwNY9UK5Udaftnxj89l4xNNC5W6yrtZCtp5 SQAYk9X7nxAD2Dciv6lJiCIkQWRErfA= X-Google-Smtp-Source: APXvYqwhvfx9pzef2B6tbhoN220A4TuJJjujYyeMIQJHfk29kC4pGsuZRbX1Nh5lHt9/bYve5QKW+A== X-Received: by 2002:a1c:4845:: with SMTP id v66mr3541257wma.144.1555596390160; Thu, 18 Apr 2019 07:06:30 -0700 (PDT) Received: from localhost (jirka.pirko.cz. [84.16.102.26]) by smtp.gmail.com with ESMTPSA id s10sm2421763wmh.0.2019.04.18.07.06.29 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Thu, 18 Apr 2019 07:06:29 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, mlxsw@mellanox.com, jakub.kicinski@netronome.com, dsahern@gmail.com Subject: [patch net-next 11/15] netdevsim: generate random switch id instead of using dev id Date: Thu, 18 Apr 2019 16:06:10 +0200 Message-Id: <20190418140614.3973-12-jiri@resnulli.us> X-Mailer: git-send-email 2.17.2 In-Reply-To: <20190418140614.3973-1-jiri@resnulli.us> References: <20190418140614.3973-1-jiri@resnulli.us> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Jiri Pirko Current implementation of parent_id/switch_id does not follow the original idea of being unique. The values are "0", "1", etc. Instead of that, generate 32 random bytes. Signed-off-by: Jiri Pirko --- drivers/net/netdevsim/dev.c | 3 +++ drivers/net/netdevsim/netdev.c | 3 +-- drivers/net/netdevsim/netdevsim.h | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/drivers/net/netdevsim/dev.c b/drivers/net/netdevsim/dev.c index ced32c85dd73..cad96c44f885 100644 --- a/drivers/net/netdevsim/dev.c +++ b/drivers/net/netdevsim/dev.c @@ -17,6 +17,7 @@ #include #include +#include #include #include @@ -204,6 +205,8 @@ static struct nsim_dev *nsim_dev_create(struct nsim_bus_dev *nsim_bus_dev) return ERR_PTR(-ENOMEM); nsim_dev = devlink_priv(devlink); nsim_dev->nsim_bus_dev = nsim_bus_dev; + nsim_dev->switch_id.id_len = sizeof(nsim_dev->switch_id.id); + get_random_bytes(nsim_dev->switch_id.id, nsim_dev->switch_id.id_len); nsim_dev->fib_data = nsim_fib_create(); if (IS_ERR(nsim_dev->fib_data)) { diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c index c5f4bbb9716f..9b4310e20129 100644 --- a/drivers/net/netdevsim/netdev.c +++ b/drivers/net/netdevsim/netdev.c @@ -32,8 +32,7 @@ static int nsim_get_port_parent_id(struct net_device *dev, { struct netdevsim *ns = netdev_priv(dev); - ppid->id_len = sizeof(ns->nsim_dev->nsim_bus_dev->dev.id); - memcpy(&ppid->id, &ns->nsim_dev->nsim_bus_dev->dev.id, ppid->id_len); + memcpy(ppid, &ns->nsim_dev->switch_id, sizeof(*ppid)); return 0; } diff --git a/drivers/net/netdevsim/netdevsim.h b/drivers/net/netdevsim/netdevsim.h index 5c03d0f6d285..47c596d85519 100644 --- a/drivers/net/netdevsim/netdevsim.h +++ b/drivers/net/netdevsim/netdevsim.h @@ -141,6 +141,7 @@ struct nsim_dev { u32 prog_id_gen; struct list_head bpf_bound_progs; struct list_head bpf_bound_maps; + struct netdev_phys_item_id switch_id; }; struct nsim_dev *nsim_dev_create_with_ns(struct nsim_bus_dev *nsim_bus_dev, -- 2.17.2