Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8DBB5238D32 for ; Wed, 2 Jul 2025 08:56:28 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751446590; cv=none; b=clQ0nL7LHUp56+ar1GEYQkXkyzR8RVP9540ETk/OAzujGe3UVOQBvjv7i1IezqB4/mn/o0JlgUuZeI3HysYWucN4Pq8Bm9SrJ5WmbMW8ZyQBKhQigE+3gO17/03Kp4QJ5RuasJQisH8hyzEweJMIpzYFZQsIcycqqkAxdXZMFgw= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1751446590; c=relaxed/simple; bh=qS9faP9kZQFAWHiAA+TgHbu1PnNiZZIItnQH+/KIz9U=; h=From:Date:Subject:MIME-Version:Content-Type:Message-Id:References: In-Reply-To:To:Cc; b=jBtFlWMIZtBLRqS4jzpU+2er1MWhYYXMtE1iT6tin/YOD7kDAPjXH0hJDry3yW/SULI6FZBxEJhcXoW5qTWI4kOspQEKEjsRlZ6Qp8BLolLEZP1tIMk0pEjH3sTo9cKNFj42lfiNl45mtzRl4T4BzZVOkwLD84EJukEtp73w+cE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=dyNm9STq; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="dyNm9STq" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1751446587; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=ou5038YfCMSsezsc+TuKk3LIuL7hz0k+oG8D9Fl1kDU=; b=dyNm9STq12W0cUx9+lvpZlv0JVu9B8RSVQ8C2lRtr1Rt5gxpDaw6ZlWkyZ/3LwuC2PIJxq e8rdoVO0SX2gLdIt9o0bB6Fixm6vNuvVLSvdgTz7kQkFLFQUVdTIVF1LL2l/Lglo1xyTcZ PuhNqUMJKpXiGpExhffJrNHQsvTUmfM= Received: from mail-ej1-f70.google.com (mail-ej1-f70.google.com [209.85.218.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-601-6r5P6C7ePe-6IrXwb9YvDg-1; Wed, 02 Jul 2025 04:56:26 -0400 X-MC-Unique: 6r5P6C7ePe-6IrXwb9YvDg-1 X-Mimecast-MFC-AGG-ID: 6r5P6C7ePe-6IrXwb9YvDg_1751446585 Received: by mail-ej1-f70.google.com with SMTP id a640c23a62f3a-ade6db50bb4so319903866b.2 for ; Wed, 02 Jul 2025 01:56:26 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1751446584; x=1752051384; h=cc:to:in-reply-to:references:message-id:content-transfer-encoding :mime-version:subject:date:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=ou5038YfCMSsezsc+TuKk3LIuL7hz0k+oG8D9Fl1kDU=; b=Gy96zyT43MtVg8hAmHgAWgt6BKXcQ7mVFcRIYQ3AVJPaDYQZAeWdXIBFGktQR80UMW jynvSh/F5L8eegSsFRqxpoWf3KIMZT1ThbZJL9zOJchqZlJosDx74x5D13j018ZS+ImS ik27XN2pbL9Aa6C1JXLmykxz9zXoewzAwQonT6zaNX1YR9LTIkjfntcFnY/zfNNAygtx LieUijjQUlwOTuxG9CRZa908/4oDaCKdVbwAP4702jFabsjzPkQcWNCCyjwEtGsgw+XQ 3oG9b2ECcjbyknYDTZsiVJil4wiXVJ+izcjKBhXI46P1RvYABiSpXSZH+FQLs6ZqHi9U Kksg== X-Gm-Message-State: AOJu0YyboHGcP8+J3zpjM0l/zM7VVnVvXRiRnoEAn15LjsuETDuoBq7s GcPeM6IJ+3Dc9lHrJMqP+PljelH0UXp5zzGX+GFQRtvuVw4opD2ieshqpOG5i++O8le6phZIi4j yvUiXgshJkJxZtTYL1JD2zD+zXAfS+MAQe2zHKrm5mp4qLMh9s5+HooeqSigOZCnE4w== X-Gm-Gg: ASbGncvm9nOW25wprKoRVfNzXjnyn9JWL73Kxs+6hj6E7oS+hVsdJJXtAefyDxz+OlZ MVHKB/HTimeWPpGVg4oOppLCh0IFOPbgI4XowFAhe7XU0Y4t0E/PxWqp/EJa0RdEHbJo/1Jp7zZ fVsGEAvoyjBtWBlRbGIH+P2QMxHUEAm4NXZ6sTf3tvZmGSzX2cPlaV4mvE3UQHMDArSEtuESI2b woU4ya+QbvftI1hQUdxNyKDj7qCu3lO8WEXgP2s3OtNMgsYEZx6HLyp8rCA+Vqk2RAFZfiKeH6C z/dzSaZYJ3EhESMDllsBReYKlB4LBEytzexXQojjFfht850= X-Received: by 2002:a17:907:94cc:b0:ae3:6f0e:4741 with SMTP id a640c23a62f3a-ae3c2d2e914mr207724466b.33.1751446584312; Wed, 02 Jul 2025 01:56:24 -0700 (PDT) X-Google-Smtp-Source: AGHT+IF8sL2q5Kd2yoHDhMduHYdh46Uk0H1dY2JLseKFE/LONUPPIbDxFqR1MYvhezcbAnJ9sZCDPg== X-Received: by 2002:a17:907:94cc:b0:ae3:6f0e:4741 with SMTP id a640c23a62f3a-ae3c2d2e914mr207720166b.33.1751446583753; Wed, 02 Jul 2025 01:56:23 -0700 (PDT) Received: from alrua-x1.borgediget.toke.dk ([45.145.92.2]) by smtp.gmail.com with ESMTPSA id a640c23a62f3a-ae35365a00bsm1020098966b.43.2025.07.02.01.56.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Jul 2025 01:56:22 -0700 (PDT) Received: by alrua-x1.borgediget.toke.dk (Postfix, from userid 1000) id AA1391B38030; Wed, 02 Jul 2025 10:56:19 +0200 (CEST) From: =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= Date: Wed, 02 Jul 2025 10:55:56 +0200 Subject: [PATCH net-next v2 1/2] net: netdevsim: Support setting dev->perm_addr on port creation Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: 8bit Message-Id: <20250702-netdevsim-perm_addr-v2-1-66359a6288f0@redhat.com> References: <20250702-netdevsim-perm_addr-v2-0-66359a6288f0@redhat.com> In-Reply-To: <20250702-netdevsim-perm_addr-v2-0-66359a6288f0@redhat.com> To: Jakub Kicinski , Andrew Lunn , "David S. Miller" , Eric Dumazet , Paolo Abeni Cc: netdev@vger.kernel.org, =?utf-8?q?Toke_H=C3=B8iland-J=C3=B8rgensen?= X-Mailer: b4 0.14.2 Network management daemons that match on the device permanent address currently have no virtual interface types to test against. NetworkManager, in particular, has carried an out of tree patch to set the permanent address on netdevsim devices to use in its CI for this purpose. To support this use case, support setting netdev->perm_addr when creating a netdevsim port. Signed-off-by: Toke Høiland-Jørgensen --- drivers/net/netdevsim/bus.c | 22 ++++++++++++++++++---- drivers/net/netdevsim/dev.c | 14 +++++++------- drivers/net/netdevsim/netdev.c | 9 ++++++--- drivers/net/netdevsim/netdevsim.h | 9 +++++---- 4 files changed, 36 insertions(+), 18 deletions(-) diff --git a/drivers/net/netdevsim/bus.c b/drivers/net/netdevsim/bus.c index 64c0cdd31bf85468ce4fa2b2af5c8aff4cfba897..422b3683afe154d9055878a601f95d7b39b30aaf 100644 --- a/drivers/net/netdevsim/bus.c +++ b/drivers/net/netdevsim/bus.c @@ -66,17 +66,31 @@ new_port_store(struct device *dev, struct device_attribute *attr, const char *buf, size_t count) { struct nsim_bus_dev *nsim_bus_dev = to_nsim_bus_dev(dev); + u8 eth_addr[ETH_ALEN] = {}; unsigned int port_index; + bool addr_set = false; int ret; /* Prevent to use nsim_bus_dev before initialization. */ if (!smp_load_acquire(&nsim_bus_dev->init)) return -EBUSY; - ret = kstrtouint(buf, 0, &port_index); - if (ret) - return ret; - ret = nsim_drv_port_add(nsim_bus_dev, NSIM_DEV_PORT_TYPE_PF, port_index); + ret = sscanf(buf, "%u %hhx:%hhx:%hhx:%hhx:%hhx:%hhx", &port_index, + ð_addr[0], ð_addr[1], ð_addr[2], ð_addr[3], + ð_addr[4], ð_addr[5]); + switch (ret) { + case 7: + addr_set = true; + fallthrough; + case 1: + break; + default: + pr_err("Format for adding new port is \"id [perm_addr]\" (uint MAC).\n"); + return -EINVAL; + } + + ret = nsim_drv_port_add(nsim_bus_dev, NSIM_DEV_PORT_TYPE_PF, port_index, + addr_set ? eth_addr : NULL); return ret ? ret : count; } diff --git a/drivers/net/netdevsim/dev.c b/drivers/net/netdevsim/dev.c index 3e0b61202f0c9824952040c8d4c79eb8775954c6..107b106be516bbc97735e93643a7f7cf3bfc0a73 100644 --- a/drivers/net/netdevsim/dev.c +++ b/drivers/net/netdevsim/dev.c @@ -576,7 +576,7 @@ static void nsim_dev_dummy_region_exit(struct nsim_dev *nsim_dev) static int __nsim_dev_port_add(struct nsim_dev *nsim_dev, enum nsim_dev_port_type type, - unsigned int port_index); + unsigned int port_index, u8 perm_addr[ETH_ALEN]); static void __nsim_dev_port_del(struct nsim_dev_port *nsim_dev_port); static int nsim_esw_legacy_enable(struct nsim_dev *nsim_dev, @@ -600,7 +600,7 @@ static int nsim_esw_switchdev_enable(struct nsim_dev *nsim_dev, int i, err; for (i = 0; i < nsim_dev_get_vfs(nsim_dev); i++) { - err = __nsim_dev_port_add(nsim_dev, NSIM_DEV_PORT_TYPE_VF, i); + err = __nsim_dev_port_add(nsim_dev, NSIM_DEV_PORT_TYPE_VF, i, NULL); if (err) { NL_SET_ERR_MSG_MOD(extack, "Failed to initialize VFs' netdevsim ports"); pr_err("Failed to initialize VF id=%d. %d.\n", i, err); @@ -1353,7 +1353,7 @@ static const struct devlink_ops nsim_dev_devlink_ops = { #define NSIM_DEV_TEST1_DEFAULT true static int __nsim_dev_port_add(struct nsim_dev *nsim_dev, enum nsim_dev_port_type type, - unsigned int port_index) + unsigned int port_index, u8 perm_addr[ETH_ALEN]) { struct devlink_port_attrs attrs = {}; struct nsim_dev_port *nsim_dev_port; @@ -1390,7 +1390,7 @@ static int __nsim_dev_port_add(struct nsim_dev *nsim_dev, enum nsim_dev_port_typ if (err) goto err_dl_port_unregister; - nsim_dev_port->ns = nsim_create(nsim_dev, nsim_dev_port); + nsim_dev_port->ns = nsim_create(nsim_dev, nsim_dev_port, perm_addr); if (IS_ERR(nsim_dev_port->ns)) { err = PTR_ERR(nsim_dev_port->ns); goto err_port_debugfs_exit; @@ -1446,7 +1446,7 @@ static int nsim_dev_port_add_all(struct nsim_dev *nsim_dev, int i, err; for (i = 0; i < port_count; i++) { - err = __nsim_dev_port_add(nsim_dev, NSIM_DEV_PORT_TYPE_PF, i); + err = __nsim_dev_port_add(nsim_dev, NSIM_DEV_PORT_TYPE_PF, i, NULL); if (err) goto err_port_del_all; } @@ -1702,7 +1702,7 @@ __nsim_dev_port_lookup(struct nsim_dev *nsim_dev, enum nsim_dev_port_type type, } int nsim_drv_port_add(struct nsim_bus_dev *nsim_bus_dev, enum nsim_dev_port_type type, - unsigned int port_index) + unsigned int port_index, u8 perm_addr[ETH_ALEN]) { struct nsim_dev *nsim_dev = dev_get_drvdata(&nsim_bus_dev->dev); int err; @@ -1711,7 +1711,7 @@ int nsim_drv_port_add(struct nsim_bus_dev *nsim_bus_dev, enum nsim_dev_port_type if (__nsim_dev_port_lookup(nsim_dev, type, port_index)) err = -EEXIST; else - err = __nsim_dev_port_add(nsim_dev, type, port_index); + err = __nsim_dev_port_add(nsim_dev, type, port_index, perm_addr); devl_unlock(priv_to_devlink(nsim_dev)); return err; } diff --git a/drivers/net/netdevsim/netdev.c b/drivers/net/netdevsim/netdev.c index e36d3e846c2dc314182efd1af03b59270397b007..f316e44130f722759f0ac4e5baac6a2f6956dc7d 100644 --- a/drivers/net/netdevsim/netdev.c +++ b/drivers/net/netdevsim/netdev.c @@ -998,8 +998,9 @@ static void nsim_exit_netdevsim(struct netdevsim *ns) mock_phc_destroy(ns->phc); } -struct netdevsim * -nsim_create(struct nsim_dev *nsim_dev, struct nsim_dev_port *nsim_dev_port) +struct netdevsim *nsim_create(struct nsim_dev *nsim_dev, + struct nsim_dev_port *nsim_dev_port, + u8 perm_addr[ETH_ALEN]) { struct net_device *dev; struct netdevsim *ns; @@ -1010,6 +1011,9 @@ nsim_create(struct nsim_dev *nsim_dev, struct nsim_dev_port *nsim_dev_port) if (!dev) return ERR_PTR(-ENOMEM); + if (perm_addr) + memcpy(dev->perm_addr, perm_addr, ETH_ALEN); + dev_net_set(dev, nsim_dev_net(nsim_dev)); ns = netdev_priv(dev); ns->netdev = dev; @@ -1031,7 +1035,6 @@ nsim_create(struct nsim_dev *nsim_dev, struct nsim_dev_port *nsim_dev_port) ns->qr_dfs = debugfs_create_file("queue_reset", 0200, nsim_dev_port->ddir, ns, &nsim_qreset_fops); - return ns; err_free_netdev: diff --git a/drivers/net/netdevsim/netdevsim.h b/drivers/net/netdevsim/netdevsim.h index 4a0c48c7a384e2036883c84dc847b82f992f1481..3a8b5510ec2914204beb15247ab60a5d9933f48d 100644 --- a/drivers/net/netdevsim/netdevsim.h +++ b/drivers/net/netdevsim/netdevsim.h @@ -143,8 +143,9 @@ struct netdevsim { struct netdev_net_notifier nn; }; -struct netdevsim * -nsim_create(struct nsim_dev *nsim_dev, struct nsim_dev_port *nsim_dev_port); +struct netdevsim *nsim_create(struct nsim_dev *nsim_dev, + struct nsim_dev_port *nsim_dev_port, + u8 perm_addr[ETH_ALEN]); void nsim_destroy(struct netdevsim *ns); bool netdev_is_nsim(struct net_device *dev); @@ -361,8 +362,8 @@ void nsim_dev_exit(void); int nsim_drv_probe(struct nsim_bus_dev *nsim_bus_dev); void nsim_drv_remove(struct nsim_bus_dev *nsim_bus_dev); int nsim_drv_port_add(struct nsim_bus_dev *nsim_bus_dev, - enum nsim_dev_port_type type, - unsigned int port_index); + enum nsim_dev_port_type type, unsigned int port_index, + u8 perm_addr[ETH_ALEN]); int nsim_drv_port_del(struct nsim_bus_dev *nsim_bus_dev, enum nsim_dev_port_type type, unsigned int port_index); -- 2.50.0