From patchwork Mon Oct 31 12:42:36 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 13025764 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2717EC38A02 for ; Mon, 31 Oct 2022 12:42:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230249AbiJaMmy (ORCPT ); Mon, 31 Oct 2022 08:42:54 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59028 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231194AbiJaMmx (ORCPT ); Mon, 31 Oct 2022 08:42:53 -0400 Received: from mail-wr1-x431.google.com (mail-wr1-x431.google.com [IPv6:2a00:1450:4864:20::431]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4104BF029 for ; Mon, 31 Oct 2022 05:42:52 -0700 (PDT) Received: by mail-wr1-x431.google.com with SMTP id z14so15775731wrn.7 for ; Mon, 31 Oct 2022 05:42:52 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=resnulli-us.20210112.gappssmtp.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=A8an90UsiLKs2claL8HWs+wiEf3vQhctPHwegzIpH0s=; b=UJk4CYIvp9kaDE3lgRbDyX148xxlxDHxPEbpSZm/MZCgp1mL4iiKIrJxu+jqwgZGJy +PnnBGjcbQ01Bb2DgNYN7VpYST3WTPETcae++qD0SrLjrIkLSN7JHSYTG/SdfRn2EI9A mia7TNRxKtbwk+vSmUxQwn0yMPVC6YdHEusabOJ1tf96aAhvp+ElFBqts1iSD9c+OJv0 mgbtvm27107iGggD6aKmAY/oheXeizpkA2L4qnIirKV1Y/Wtj47niKu8OHnyTNuwv6Yg gYyfx7YIbMtecruiQF3uO/lIyjFkJKZKSqynjnQ7pt8p2+Ccvbb9m6LXnru552WIrg0Q +MnQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=A8an90UsiLKs2claL8HWs+wiEf3vQhctPHwegzIpH0s=; b=5DqpDS5VN2Jc7rfXdYmcEs1+oRNvLV0gGPjsBj6hcK9eg/yCwJELH+Ipe+NSZD3W3j 95yO3dvUFwwOIFwJSE6BB5oTuv3nw7VsTWM4O+Kh2iLcu8aCbCD9PsSYltEmxx4qDb+r 6Pw6UjG6N1DkH+sY3hYCqyuMpzfZ6CeQrP9rNT2SdevIpvv27t9Vx+O0pm1XpHixdkas HYEEWAaeSnqi2G7+OmpYhvoSMMCHS50jFftHZnv/mafl3jfk/NDiel2lEnLS9iu+8tGf YNnIZ6ndRxC2iJuabl05WN7mcmOhKc+htZ6DWWYSsYmYbzV9y8cnvizLhGKrzmPNBqMr wQTw== X-Gm-Message-State: ACrzQf3/hI+Z91DO/ADGODzeAFrYCckp1TSpjDcpsOespWEdbSOyL9HT QyxC2kZsKN3qWMHpeulsm7xeAw== X-Google-Smtp-Source: AMsMyM5s/bETjONVsNNG+fpJwKUXp+9N6rNKieiQxNy1dhp3BgL9mBetu7zqRren3dWZf90430a6DQ== X-Received: by 2002:a5d:44d2:0:b0:236:d8c5:122e with SMTP id z18-20020a5d44d2000000b00236d8c5122emr1419442wrr.611.1667220170752; Mon, 31 Oct 2022 05:42:50 -0700 (PDT) Received: from localhost ([86.61.181.4]) by smtp.gmail.com with ESMTPSA id h10-20020a5d4fca000000b002367ad808a9sm6994892wrw.30.2022.10.31.05.42.50 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 31 Oct 2022 05:42:50 -0700 (PDT) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, kuba@kernel.org, pabeni@redhat.com, edumazet@google.com, tariqt@nvidia.com, moshe@nvidia.com, saeedm@nvidia.com, linux-rdma@vger.kernel.org Subject: [patch net-next v3 01/13] net: devlink: convert devlink port type-specific pointers to union Date: Mon, 31 Oct 2022 13:42:36 +0100 Message-Id: <20221031124248.484405-2-jiri@resnulli.us> X-Mailer: git-send-email 2.37.3 In-Reply-To: <20221031124248.484405-1-jiri@resnulli.us> References: <20221031124248.484405-1-jiri@resnulli.us> MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: linux-rdma@vger.kernel.org From: Jiri Pirko Instead of storing type_dev as a void pointer, convert it to union and use it to store either struct net_device or struct ib_device pointer. Signed-off-by: Jiri Pirko --- include/net/devlink.h | 13 ++++++++++--- net/core/devlink.c | 17 +++++++++++++---- 2 files changed, 23 insertions(+), 7 deletions(-) diff --git a/include/net/devlink.h b/include/net/devlink.h index ba6b8b094943..6c55aabaedf1 100644 --- a/include/net/devlink.h +++ b/include/net/devlink.h @@ -121,12 +121,19 @@ struct devlink_port { struct list_head region_list; struct devlink *devlink; unsigned int index; - spinlock_t type_lock; /* Protects type and type_dev - * pointer consistency. + spinlock_t type_lock; /* Protects type and type_eth/ib + * structures consistency. */ enum devlink_port_type type; enum devlink_port_type desired_type; - void *type_dev; + union { + struct { + struct net_device *netdev; + } type_eth; + struct { + struct ib_device *ibdev; + } type_ib; + }; struct devlink_port_attrs attrs; u8 attrs_set:1, switch_port:1, diff --git a/net/core/devlink.c b/net/core/devlink.c index 0a16ad45520e..868d04c2164f 100644 --- a/net/core/devlink.c +++ b/net/core/devlink.c @@ -1303,7 +1303,7 @@ static int devlink_nl_port_fill(struct sk_buff *msg, goto nla_put_failure_type_locked; if (devlink_port->type == DEVLINK_PORT_TYPE_ETH) { struct net *net = devlink_net(devlink_port->devlink); - struct net_device *netdev = devlink_port->type_dev; + struct net_device *netdev = devlink_port->type_eth.netdev; if (netdev && net_eq(net, dev_net(netdev)) && (nla_put_u32(msg, DEVLINK_ATTR_PORT_NETDEV_IFINDEX, @@ -1313,7 +1313,7 @@ static int devlink_nl_port_fill(struct sk_buff *msg, goto nla_put_failure_type_locked; } if (devlink_port->type == DEVLINK_PORT_TYPE_IB) { - struct ib_device *ibdev = devlink_port->type_dev; + struct ib_device *ibdev = devlink_port->type_ib.ibdev; if (ibdev && nla_put_string(msg, DEVLINK_ATTR_PORT_IBDEV_NAME, @@ -10003,7 +10003,16 @@ static void __devlink_port_type_set(struct devlink_port *devlink_port, devlink_port_type_warn_cancel(devlink_port); spin_lock_bh(&devlink_port->type_lock); devlink_port->type = type; - devlink_port->type_dev = type_dev; + switch (type) { + case DEVLINK_PORT_TYPE_ETH: + devlink_port->type_eth.netdev = type_dev; + break; + case DEVLINK_PORT_TYPE_IB: + devlink_port->type_ib.ibdev = type_dev; + break; + default: + break; + } spin_unlock_bh(&devlink_port->type_lock); devlink_port_notify(devlink_port, DEVLINK_CMD_PORT_NEW); } @@ -12016,7 +12025,7 @@ devlink_trap_report_metadata_set(struct devlink_trap_metadata *metadata, spin_lock(&in_devlink_port->type_lock); if (in_devlink_port->type == DEVLINK_PORT_TYPE_ETH) - metadata->input_dev = in_devlink_port->type_dev; + metadata->input_dev = in_devlink_port->type_eth.netdev; spin_unlock(&in_devlink_port->type_lock); }