From patchwork Wed Feb 19 20:27:14 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stanislav Fomichev X-Patchwork-Id: 13982856 X-Patchwork-Delegate: kuba@kernel.org Received: from mail-pj1-f48.google.com (mail-pj1-f48.google.com [209.85.216.48]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8F0CC230991 for ; Wed, 19 Feb 2025 20:27:30 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.48 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739996852; cv=none; b=d0gUyt732K2MCU85L4XFb151MWhsrIZF1L0Zg1bQcDZjeFMs1bM4aIGXyWhcCx0csdu1tL7ADllEN6TL5FOj78+oT/LrS6a64jjoxE9YSfpRAp3fW4jTRbtFXCvORKrD27IWDS+mjFUc33Cp/eNrVLrVHhDS7aJr9pyACQ2XnGg= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1739996852; c=relaxed/simple; bh=RxKHWLO+aaUtihwS54vVouCSPFKBGrL7H1v64n8anTY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=oZ8YhdaswcU24ZkYR1K5hv19AO+dhyexwJxS5+wXc66QVtttm9Y3wqKwXrZ2blh37uCRXLWiDVVp8e14+eHFw9XFEzJcKD7jSyp+TM94NmLc5kjN/L+44Rz9KDw8fasKDwW0JtjEkcoyCqv9O67VWM1UpuPMaxu/8ekrsg83FbE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=fomichev.me; spf=pass smtp.mailfrom=gmail.com; arc=none smtp.client-ip=209.85.216.48 Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=fomichev.me Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Received: by mail-pj1-f48.google.com with SMTP id 98e67ed59e1d1-2f83a8afcbbso414712a91.1 for ; Wed, 19 Feb 2025 12:27:30 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1739996850; x=1740601650; 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=wnX45BtPrcA1r80hmFVlirmfNlcc3+tknfGGVzHqrkg=; b=iRtwrfGapKhI6PRc179ZlsQUmd/yTnaRydGM/+6E4xLVAcPs0dcDWFZbrpWoegGyTL JTLs8ayKN1ghh1Wk1JOPH58Ubea/xF4ormtxY7SpM7kw0hMAxBz7tRwhYJf+MWwBcWS5 wNNe4F3EuKURRmpmNUxvOcTzxKWHQiWP09y3c9Cw9WjjoUDw0EbztUykHkiyM7NSlHwZ WQPTbYLlQ0ssd+w/Mn8KOSJ+wOIPnkDTWgHU96ARM3ybz19rfuc6yGmUzmRLH/PkBMoO reYKmWLIsUDPnOEi2WVYnjNLZdxZaE1JU4+X+q0Bt9S25DijlrEj80uRE5d6CEVvec8j 6pCw== X-Gm-Message-State: AOJu0YwgP7xs4/kWYsIAY1o16G68+7fEWRkiRvCAsGDlXidsM+G6aY8x eg3ZDr2x1WnpaR7mk5I0dwD1aaL5FP/k50P9UWXFOu70CEk9R5A4YQTV X-Gm-Gg: ASbGncuRsif56cJlcNtH0gmMxSP3d7aeNuaCde38Lh/sPm6eW01S1dKibqTukh7EG9/ RImeM/nyjeRD99LpMLDAc4A5HJVYp/ISD/F+x3FeLfz3+Cyjdi0U5JYzX0zgs3kxuo8xKw3IoLH 38SUrI6jhrqC57xE+5sqw6YFlH6FlK4+XWMsjiXz8/bvlBS66ER/LTa3gHz3lgwUqqyGTNrEqP+ YofacolXY9JzRYX2Tso70mTOyiYAiOQ5dPpcr2sWVcHVFTB8XeLwllUez4x7mLJ5O+UhUtX27bE oe+yRAiIKziTchY= X-Google-Smtp-Source: AGHT+IGf1u6KW5ymsUKpWKUZ5N5VgzrE5HtznbTRE4ZrpjWDzr+quvuPg2u6SFw60azTbiXnMEStrg== X-Received: by 2002:a17:90b:4a50:b0:2ea:8aac:6ac1 with SMTP id 98e67ed59e1d1-2fccc363d83mr985819a91.15.1739996849640; Wed, 19 Feb 2025 12:27:29 -0800 (PST) Received: from localhost ([2601:646:9e00:f56e:2844:3d8f:bf3e:12cc]) by smtp.gmail.com with UTF8SMTPSA id 98e67ed59e1d1-2fbf98d3b80sm14336157a91.17.2025.02.19.12.27.29 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 19 Feb 2025 12:27:29 -0800 (PST) From: Stanislav Fomichev To: netdev@vger.kernel.org Cc: davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, Saeed Mahameed Subject: [PATCH net-next v5 07/12] net: hold netdev instance lock during ndo_bpf Date: Wed, 19 Feb 2025 12:27:14 -0800 Message-ID: <20250219202719.957100-8-sdf@fomichev.me> X-Mailer: git-send-email 2.48.1 In-Reply-To: <20250219202719.957100-1-sdf@fomichev.me> References: <20250219202719.957100-1-sdf@fomichev.me> Precedence: bulk X-Mailing-List: netdev@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Patchwork-Delegate: kuba@kernel.org Cover the paths that come via bpf system call and XSK bind. Cc: Saeed Mahameed Signed-off-by: Stanislav Fomichev --- include/linux/netdevice.h | 1 + kernel/bpf/offload.c | 6 ++++-- net/core/dev.c | 13 +++++++++++-- net/core/dev_api.c | 12 ++++++++++++ net/xdp/xsk.c | 3 +++ net/xdp/xsk_buff_pool.c | 2 ++ 6 files changed, 33 insertions(+), 4 deletions(-) diff --git a/include/linux/netdevice.h b/include/linux/netdevice.h index 44882c91d484..e1abaf3904f4 100644 --- a/include/linux/netdevice.h +++ b/include/linux/netdevice.h @@ -4238,6 +4238,7 @@ struct sk_buff *dev_hard_start_xmit(struct sk_buff *skb, struct net_device *dev, int bpf_xdp_link_attach(const union bpf_attr *attr, struct bpf_prog *prog); u8 dev_xdp_prog_count(struct net_device *dev); +int netif_xdp_propagate(struct net_device *dev, struct netdev_bpf *bpf); int dev_xdp_propagate(struct net_device *dev, struct netdev_bpf *bpf); u8 dev_xdp_sb_prog_count(struct net_device *dev); u32 dev_xdp_prog_id(struct net_device *dev, enum bpf_xdp_mode mode); diff --git a/kernel/bpf/offload.c b/kernel/bpf/offload.c index 1a4fec330eaa..a10153c3be2d 100644 --- a/kernel/bpf/offload.c +++ b/kernel/bpf/offload.c @@ -528,10 +528,10 @@ struct bpf_map *bpf_map_offload_map_alloc(union bpf_attr *attr) return ERR_PTR(-ENOMEM); bpf_map_init_from_attr(&offmap->map, attr); - rtnl_lock(); - down_write(&bpf_devs_lock); offmap->netdev = __dev_get_by_index(net, attr->map_ifindex); + netdev_lock_ops(offmap->netdev); + down_write(&bpf_devs_lock); err = bpf_dev_offload_check(offmap->netdev); if (err) goto err_unlock; @@ -548,12 +548,14 @@ struct bpf_map *bpf_map_offload_map_alloc(union bpf_attr *attr) list_add_tail(&offmap->offloads, &ondev->maps); up_write(&bpf_devs_lock); + netdev_unlock_ops(offmap->netdev); rtnl_unlock(); return &offmap->map; err_unlock: up_write(&bpf_devs_lock); + netdev_unlock_ops(offmap->netdev); rtnl_unlock(); bpf_map_area_free(offmap); return ERR_PTR(err); diff --git a/net/core/dev.c b/net/core/dev.c index c40cb752a419..3ed4f231a974 100644 --- a/net/core/dev.c +++ b/net/core/dev.c @@ -9637,7 +9637,7 @@ u8 dev_xdp_sb_prog_count(struct net_device *dev) return count; } -int dev_xdp_propagate(struct net_device *dev, struct netdev_bpf *bpf) +int netif_xdp_propagate(struct net_device *dev, struct netdev_bpf *bpf) { if (!dev->netdev_ops->ndo_bpf) return -EOPNOTSUPP; @@ -9657,7 +9657,6 @@ int dev_xdp_propagate(struct net_device *dev, struct netdev_bpf *bpf) return dev->netdev_ops->ndo_bpf(dev, bpf); } -EXPORT_SYMBOL_GPL(dev_xdp_propagate); u32 dev_xdp_prog_id(struct net_device *dev, enum bpf_xdp_mode mode) { @@ -9687,6 +9686,8 @@ static int dev_xdp_install(struct net_device *dev, enum bpf_xdp_mode mode, struct netdev_bpf xdp; int err; + netdev_ops_assert_locked(dev); + if (dev->cfg->hds_config == ETHTOOL_TCP_DATA_SPLIT_ENABLED && prog && !prog->aux->xdp_has_frags) { NL_SET_ERR_MSG(extack, "unable to install XDP to device using tcp-data-split"); @@ -9919,7 +9920,9 @@ static void bpf_xdp_link_release(struct bpf_link *link) * already NULL, in which case link was already auto-detached */ if (xdp_link->dev) { + netdev_lock_ops(xdp_link->dev); WARN_ON(dev_xdp_detach_link(xdp_link->dev, NULL, xdp_link)); + netdev_unlock_ops(xdp_link->dev); xdp_link->dev = NULL; } @@ -10001,10 +10004,12 @@ static int bpf_xdp_link_update(struct bpf_link *link, struct bpf_prog *new_prog, goto out_unlock; } + netdev_lock_ops(xdp_link->dev); mode = dev_xdp_mode(xdp_link->dev, xdp_link->flags); bpf_op = dev_xdp_bpf_op(xdp_link->dev, mode); err = dev_xdp_install(xdp_link->dev, mode, bpf_op, NULL, xdp_link->flags, new_prog); + netdev_unlock_ops(xdp_link->dev); if (err) goto out_unlock; @@ -10790,7 +10795,9 @@ int register_netdevice(struct net_device *dev) if (ret) goto err_uninit_notify; + netdev_lock_ops(dev); __netdev_update_features(dev); + netdev_unlock_ops(dev); /* * Default initial state at registry is that the @@ -11729,7 +11736,9 @@ void unregister_netdevice_many_notify(struct list_head *head, /* Shutdown queueing discipline. */ dev_shutdown(dev); dev_tcx_uninstall(dev); + netdev_lock_ops(dev); dev_xdp_uninstall(dev); + netdev_unlock_ops(dev); bpf_dev_bound_netdev_unregister(dev); dev_memory_provider_uninstall(dev); diff --git a/net/core/dev_api.c b/net/core/dev_api.c index 87a62022ef1c..0db20ed086d3 100644 --- a/net/core/dev_api.c +++ b/net/core/dev_api.c @@ -317,3 +317,15 @@ int dev_set_mac_address(struct net_device *dev, struct sockaddr *sa, return ret; } EXPORT_SYMBOL(dev_set_mac_address); + +int dev_xdp_propagate(struct net_device *dev, struct netdev_bpf *bpf) +{ + int ret; + + netdev_lock_ops(dev); + ret = netif_xdp_propagate(dev, bpf); + netdev_unlock_ops(dev); + + return ret; +} +EXPORT_SYMBOL_GPL(dev_xdp_propagate); diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c index 0edf25973072..297a1b3ccc68 100644 --- a/net/xdp/xsk.c +++ b/net/xdp/xsk.c @@ -1178,6 +1178,8 @@ static int xsk_bind(struct socket *sock, struct sockaddr *addr, int addr_len) goto out_release; } + netdev_lock_ops(dev); + if (!xs->rx && !xs->tx) { err = -EINVAL; goto out_unlock; @@ -1312,6 +1314,7 @@ static int xsk_bind(struct socket *sock, struct sockaddr *addr, int addr_len) smp_wmb(); WRITE_ONCE(xs->state, XSK_BOUND); } + netdev_unlock_ops(dev); out_release: mutex_unlock(&xs->mutex); rtnl_unlock(); diff --git a/net/xdp/xsk_buff_pool.c b/net/xdp/xsk_buff_pool.c index c263fb7a68dc..0e6ca568fdee 100644 --- a/net/xdp/xsk_buff_pool.c +++ b/net/xdp/xsk_buff_pool.c @@ -1,5 +1,6 @@ // SPDX-License-Identifier: GPL-2.0 +#include #include #include #include @@ -219,6 +220,7 @@ int xp_assign_dev(struct xsk_buff_pool *pool, bpf.xsk.pool = pool; bpf.xsk.queue_id = queue_id; + netdev_ops_assert_locked(netdev); err = netdev->netdev_ops->ndo_bpf(netdev, &bpf); if (err) goto err_unreg_pool;