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=-5.5 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_PASS, URIBL_BLOCKED,USER_AGENT_MUTT 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 7C125C10F14 for ; Tue, 23 Apr 2019 07:20:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3C6452077C for ; Tue, 23 Apr 2019 07:20:19 +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="U/mH3eB8" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726357AbfDWHUS (ORCPT ); Tue, 23 Apr 2019 03:20:18 -0400 Received: from mail-wm1-f65.google.com ([209.85.128.65]:37575 "EHLO mail-wm1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725888AbfDWHUR (ORCPT ); Tue, 23 Apr 2019 03:20:17 -0400 Received: by mail-wm1-f65.google.com with SMTP id v14so17354471wmf.2 for ; Tue, 23 Apr 2019 00:20:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:references:mime-version :content-disposition:in-reply-to:user-agent; bh=UfHGj6HwkSkrXxmqEd/Gpiohk4P/0/UgupbBK38AicQ=; b=U/mH3eB8Vo8vMRx5TFsWdYYxCRWnrfwt7vtJ29pasxp5Wx9zBbUy/IbWUXh9VE8C0h InUZFYPPBSG0CSyeWn/PGI8fXWDZfAuZavOhd6KzG3ICi6158LSnLkbhhmhRg8Lm9eoV VJkqMltlq2LxUlutShAsSQBegx2DhvUVyAy01UNQbwQOLg7Zyvw6nrwhsD5tkylNyHUW 6AQ6CUutfHQQbdthJkszkeLfwcXhcU/DuJiwPaGm4TAOHtDou2TuelFH3YhBiEASSfoW LRhz5WXvNQoKf4q6oEaOLDv9V1IBdlYHhZfO8klSXbYoIMU1q/jgqabQ19xK2HqL6vcY GLFA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:references :mime-version:content-disposition:in-reply-to:user-agent; bh=UfHGj6HwkSkrXxmqEd/Gpiohk4P/0/UgupbBK38AicQ=; b=jhzvgM+N5T1r5QCIn4MTUI8vfmEHLmfRJoi1DkGOTps67mydceEUX1eQOu7U1onn/C JLF0eO1JgIywqkS7NjPExBMwtBbh7FhP5BWqWsPrKkRqc03lPFrjqYpZsjbgf94X0ErY mcjMtppe2jAgyRTJwvQw6pNX2jxTjCRdk3g31N00mCc5KxYGvp602C9ZxyB7BOODwRFP Bc0sD4EyX8C0//Pz+yN8E3mqYSwsRUYd++D5NeN0FLtXKUrWFrKC6g2CanXkb9FrT24F naKA26EyxNKNmf+YZLpX7SRZg0l8hJ250bPri2/Yi078CvQqKWZxYmwqX5Aq6EODXOZB jWqQ== X-Gm-Message-State: APjAAAVhndQe6MmX2TUdv3r3GKlPXm5NKhHy6lTZEwjY1uwojnv29+dx SouZYOWbP+lAXpOlf7p7rNsrYw== X-Google-Smtp-Source: APXvYqzIrLqhr6uBQx1CZv2zh3/8LnTGayixR62J3WCq4cM+0AjmoMd+hGRRuRueH39/Sf8wTeWDVQ== X-Received: by 2002:a1c:230e:: with SMTP id j14mr1095384wmj.120.1556004015389; Tue, 23 Apr 2019 00:20:15 -0700 (PDT) Received: from localhost (jirka.pirko.cz. [84.16.102.26]) by smtp.gmail.com with ESMTPSA id y127sm15044315wmg.29.2019.04.23.00.20.14 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Tue, 23 Apr 2019 00:20:14 -0700 (PDT) Date: Tue, 23 Apr 2019 09:20:14 +0200 From: Jiri Pirko To: Jakub Kicinski Cc: netdev@vger.kernel.org, davem@davemloft.net, mlxsw@mellanox.com, dsahern@gmail.com Subject: Re: [patch net-next v2 15/16] netdevsim: move netdev creation/destruction to dev probe Message-ID: <20190423072014.GC2677@nanopsycho.orion> References: <20190420102922.6001-1-jiri@resnulli.us> <20190420102922.6001-16-jiri@resnulli.us> <20190422123133.161fb1a1@cakuba.netronome.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20190422123133.161fb1a1@cakuba.netronome.com> User-Agent: Mutt/1.11.3 (2019-02-01) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Mon, Apr 22, 2019 at 09:31:33PM CEST, jakub.kicinski@netronome.com wrote: >On Sat, 20 Apr 2019 12:29:21 +0200, Jiri Pirko wrote: >> diff --git a/tools/testing/selftests/bpf/test_offload.py b/tools/testing/selftests/bpf/test_offload.py >> index 5f2e4f9e70e4..a0566dcf064a 100755 >> --- a/tools/testing/selftests/bpf/test_offload.py >> +++ b/tools/testing/selftests/bpf/test_offload.py >> @@ -1,6 +1,7 @@ >> #!/usr/bin/python3 >> >> # Copyright (C) 2017 Netronome Systems, Inc. >> +# Copyright (c) 2019 Mellanox Technologies. All rights reserved > >What's your guiding principle with adding those copyright lines >everywhere? Semi-random :) I can remove it if you want. > >> # This software is licensed under the GNU General License Version 2, >> # June 1991 as shown in the file COPYING in the top-level directory of this >> @@ -24,6 +25,7 @@ import struct >> import subprocess >> import time >> import traceback >> +import errno > >aphabetic order. Ok. > >> >> logfile = None >> log_level = 1 >> @@ -323,42 +325,85 @@ class DebugfsDir: >> >> return dfs >> >> -class NetdevSim: >> +class NetdevSimDev: >> """ >> - Class for netdevsim netdevice and its attributes. >> + Class for netdevsim bus device and its attributes. >> """ >> >> - def __init__(self, link=None): >> - self.link = link >> + def __init__(self, port_count=1): >> + addr = 0 >> + while True: >> + try: >> + with open("/sys/bus/netdevsim/new_device","w") as f: > >space after , Ok. > >> + f.write("%u %u" % (addr, port_count)) >> + except OSError as e: >> + if e.errno == errno.ENOSPC: >> + addr += 1 >> + continue >> + raise e >> + break >> >> - self.dev = self._netdevsim_create() >> devs.append(self) >> + self.addr = addr >> + self.dfs_dir = "/sys/kernel/debug/netdevsim/netdevsim%u/" % addr >> >> - self.ns = "" >> + self.nsims = [] >> + for port_index in range(port_count): >> + self.nsims.append(NetdevSim(self, port_index)) >> >> - self.dfs_dir = '/sys/kernel/debug/netdevsim/netdevsim0/ports/0/' >> - self.dev_dir = self.dfs_dir + '/dev/' >> - self.dfs_refresh() >> + def dfs_num_bound_progs(self): >> + path = os.path.join(self.dfs_dir, "bpf_bound_progs") >> + _, progs = cmd('ls %s' % (path)) >> + return len(progs.split()) >> >> - def __getitem__(self, key): >> - return self.dev[key] >> + def dfs_get_bound_progs(self, expected): >> + progs = DebugfsDir(os.path.join(self.dfs_dir, "bpf_bound_progs")) >> + if expected is not None: >> + if len(progs) != expected: >> + fail(True, "%d BPF programs bound, expected %d" % >> + (len(progs), expected)) >> + return progs >> >> - def _netdevsim_create(self): >> - link = "" if self.link is None else "link " + self.link.dev['ifname'] >> - _, old = ip("link show") >> - ip("link add sim%d {link} type netdevsim".format(link=link)) >> - _, new = ip("link show") >> + def remove(self): >> + with open("/sys/bus/netdevsim/del_device","w") as f: > >and here, etc. ok > >> + f.write("%u" % self.addr) >> + devs.remove(self) >> >> - for dev in new: >> - f = filter(lambda x: x["ifname"] == dev["ifname"], old) >> - if len(list(f)) == 0: >> - return dev >> + def remove_nsim(self, nsim): >> + self.nsims.remove(nsim) >> + with open("/sys/bus/netdevsim/devices/netdevsim%u/del_port" % self.addr ,"w") as f: >> + f.write("%u" % nsim.port_index) >> >> - raise Exception("failed to create netdevsim device") >> +class NetdevSim: >> + """ >> + Class for netdevsim netdevice and its attributes. >> + """ >> + >> + def __init__(self, nsimdev, port_index): >> + self.nsimdev = nsimdev >> + self.port_index = port_index >> + self.ns = "" >> + self.dfs_dir = "%s/ports/%u/" % (nsimdev.dfs_dir, port_index) >> + self.dfs_refresh() >> + >> + ifname = "eni%unp%u" % (nsimdev.addr, port_index + 1) >> + timeout = 0.5 >> + timeout_start = time.time() >> + >> + while True: >> + try: >> + _, [self.dev] = ip("link show dev %s" % ifname) >> + except Exception as e: >> + if time.time() < timeout_start + timeout: >> + continue >> + raise e >> + break > >udevadm settle? The reliance on latest systemd is a real bad idea, Not sure that "udevadm settle" would help here. The diver bus probe handle may be executed from a workqueue, so here, there might be the udev event queue empty yet still the netdev is not present. >could you fall back to netdevsimX names if eni$SOME$CUFT is not found? That would not help. If you have udev which does not support this, you are going to endup with "eth0, eth1, .." > >> + def __getitem__(self, key): >> + return self.dev[key] >> >> def remove(self): >> - devs.remove(self) >> - ip("link del dev %s" % (self.dev["ifname"]), ns=self.ns) >> + self.nsimdev.remove_nsim(self) >> >> def dfs_refresh(self): >> self.dfs = DebugfsDir(self.dfs_dir)