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=-4.0 required=3.0 tests=DKIM_SIGNED,DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_PASS 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 C6903C10F11 for ; Mon, 22 Apr 2019 19:31:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 76E2820896 for ; Mon, 22 Apr 2019 19:31:41 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=netronome-com.20150623.gappssmtp.com header.i=@netronome-com.20150623.gappssmtp.com header.b="KxCd29y5" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726994AbfDVTbk (ORCPT ); Mon, 22 Apr 2019 15:31:40 -0400 Received: from mail-qk1-f196.google.com ([209.85.222.196]:42937 "EHLO mail-qk1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726305AbfDVTbj (ORCPT ); Mon, 22 Apr 2019 15:31:39 -0400 Received: by mail-qk1-f196.google.com with SMTP id c190so3342662qke.9 for ; Mon, 22 Apr 2019 12:31:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=netronome-com.20150623.gappssmtp.com; s=20150623; h=date:from:to:cc:subject:message-id:in-reply-to:references :organization:mime-version:content-transfer-encoding; bh=i4AFc4kuTV1XKRDX7/uyF+BkwkKdTOZfpxysoFuOuvs=; b=KxCd29y5dC7G4S8wAVa+uBM2qgAz+F3te+wBvVROpInx4cnw5BOcWLB4uQxJb0nNW/ Ov00NDG9U9dhrN95WjgIvWrgTneyf+pQkWgeQYf8+7BsJDSCsFhAMguay+oPwGX+eXFn Fhx67RopYQtEPdL5PWmkJBcbWU/5yC3vX4I5nUCzam3sY/cC2udGAAY+UIDgs2+rCbKY GfC6KVqOtJvJPBy2KcUvznKU6ah0d8Fi9EnsQYarRi2BLOqj12Ap4A287NBvLZ/mf2FH 9uw5vZhs5p6+Id9iEh+GmP4ADeLCxAGpa1uDeO71LJmCRKR/A9Q4rWo7HqvuJ5fmzYFb w3Mw== 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:in-reply-to :references:organization:mime-version:content-transfer-encoding; bh=i4AFc4kuTV1XKRDX7/uyF+BkwkKdTOZfpxysoFuOuvs=; b=VUNQ0ss7PlviBJ4ReyvbKy1DK0A6ADAz7UeM/zY3YI1iu5xs0gBEsuU1oxH2KFEeQ+ ounEKXUrTeWRM659/C93hWrFtISthidVo2DJesYsHhNeOvj+P0xTdN4JnAmj0Ca+iwj5 TmX1i0EhEpMbAcWTN8zwbNGt9IPyM6X2R8LHa4Xuy2RlMGKt4YqppKvx/KHGJprCbjv4 w+m7FjN+JAlgqaZTGJQYRVqykjPIA5iq60aOwJ/Q/OjRFLGLIv3twE3nBFEaR+mQ41L2 4O38X/39kaWR1oj3DbfScx7i4EXLgQTrJkOIUg71lzHV0hhUm6iS0PW3bLQwSMkKtrsm fn8g== X-Gm-Message-State: APjAAAXy4KYeGwmi2bLKyrkVT4foafQ5qmbz5NHy39I+8lhJwhlNpdbz 18ztrD+WTyURP6A9OQpIY3osHan48xQ= X-Google-Smtp-Source: APXvYqylIUjUQ5y5AZyGkkONaJEvJaGs3mSu4WNV+PPZY/dk6lwKzm3ZyJM7BezY2xgP9H+j4raZ8w== X-Received: by 2002:a05:620a:3d0:: with SMTP id r16mr16029895qkm.210.1555961498262; Mon, 22 Apr 2019 12:31:38 -0700 (PDT) Received: from cakuba.netronome.com ([66.60.152.14]) by smtp.gmail.com with ESMTPSA id i24sm8683597qti.76.2019.04.22.12.31.37 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 22 Apr 2019 12:31:38 -0700 (PDT) Date: Mon, 22 Apr 2019 12:31:33 -0700 From: Jakub Kicinski To: Jiri Pirko 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: <20190422123133.161fb1a1@cakuba.netronome.com> In-Reply-To: <20190420102922.6001-16-jiri@resnulli.us> References: <20190420102922.6001-1-jiri@resnulli.us> <20190420102922.6001-16-jiri@resnulli.us> Organization: Netronome Systems, Ltd. MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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? > # 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. > > 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 , > + 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. > + 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, could you fall back to netdevsimX names if eni$SOME$CUFT is not found? > + 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)