From patchwork Sat Aug 31 00:43:01 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mina Almasry X-Patchwork-Id: 13785779 Received: from mail-yw1-f202.google.com (mail-yw1-f202.google.com [209.85.128.202]) (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 0FD8218EB1 for ; Sat, 31 Aug 2024 00:43:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.128.202 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725065008; cv=none; b=N1zfbrc9cQkMZIY9rxT4AQSlqQRhPeq0+Goi3xMnTI0VECXiFUyC4krVuwYX3TbidgHCfZ68ZTwHGhXPvCduIFAoYn7ML5Ko4Bla2+F+xPK+nC3YEq3Db4ks8pDxp6dGHUy60RIJjcaCUo2l0Pszhl2M7iwJDaexn2UrI7Bh7U8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725065008; c=relaxed/simple; bh=DNA3F85kfwiW9bgsfvLXXO875oSihrq+DpGt530m/B8=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=KiXEWGZD4HfdQg64XiNv++Iu2hspwzyxeKBpA99PsrzmeQCd5QopEkaC9Br6Ba//3ILaYnIgZFEdETTFPup+fjdw2E2PCHFi4RsVIqv6mDF3MXywSdDKOWsBiRAiSjHotHDjJbsN+cSZNchRsCA9KiJCEjdop1jNQYC5M6KPrQk= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com; spf=pass smtp.mailfrom=flex--almasrymina.bounces.google.com; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b=azMPChzD; arc=none smtp.client-ip=209.85.128.202 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=google.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=flex--almasrymina.bounces.google.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=google.com header.i=@google.com header.b="azMPChzD" Received: by mail-yw1-f202.google.com with SMTP id 00721157ae682-6d54ab222fcso3602497b3.1 for ; Fri, 30 Aug 2024 17:43:24 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1725065004; x=1725669804; darn=vger.kernel.org; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=i/PEygQn081YuovQ6b+Ov4J7AW7lnL8H+wq29MS093A=; b=azMPChzDkPqN4R2nE+4ohEK23qRRIGV/4/IbLi5WnOl+Jz4A+yqGoqZ1PbLbTCVfaP 4/MGCx96KzXwBPuv2ghS5v5e822Rfaoc7CMjybw4rEgVHBCTwSq6lGz1c5syF2MgYBae S7bB7DrXf93vHI7j6XbDLeUzHJ4I2LC7jDMf04AXbxFfo2cZW75bt3vT8HpPMqTP0K6o X4BVca3brwR5vu1pJeA0JKN4MJdm9inzVvbq745iqz0bmFPM6pVS94mlpGhI1/WyAWGu soePyoyzCzPLeooO99FW5pdaB+obnEmE+JRvdqmSgE5P5wtZOr7tZZHiYYPy3yomZMpm 3H2g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1725065004; x=1725669804; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=i/PEygQn081YuovQ6b+Ov4J7AW7lnL8H+wq29MS093A=; b=sX/eqAX3ouKCd3Uu87XQhEW4Zq7kXP7IvHJPVApDbFJdARfFUeZXnSRHEk+KRnaD4G tSCdULewJXxuDuh8xdxoSW6WhfNygynyTuSr2LaHheeCjgp2hHok8lHe4blYy39AabyJ Ed4nYJXBbELzNtzkSxt498dKGIkHIE1q9sB1k40+l7r3dvbtu93mzyaIEptrPC9s23cD +G6q/F4uK1cWvt90aERAeeFZ7Wh9u2yBAbOTka2htuIvNwjO4lU+FxAe7kyGEQAyZrmE TVy6HPLwm55VPipuQzCYBfkiC3+g1OcQcuFIgKxZPAEZMCg8h7mrf6WYJXARXaPFO+Nn bLkA== X-Forwarded-Encrypted: i=1; AJvYcCWtfdAj/vWoY//ko/BhCPTcXoXlO6ZeJgfxfNxhN2wXn7rD4zyf9JPxcpbQ+yX5BFR5aue0GRiEb1zp@vger.kernel.org X-Gm-Message-State: AOJu0Yx/6p5noDaLDWjkMK3a6gi0yFtaLH64Mp4Pks8XX+gnA6zUa3sQ eYRbjX5rb6B//LIAAOITv9/EeD4hIC28Cn9obqHdDx49h4LJk0CZsqMnBs8iXJC0Xdk6sydYHmi Kb7mcNmDw3Q0zK5oBp3wjfA== X-Google-Smtp-Source: AGHT+IHvaiFLWI7jg01LKeNnv2Qw+qR1nJ7Wh/nRiZMl+xJT0kMWqv6YTjOWPAZOkoUgI7K1BnW8Q/f7/NXjnbQehA== X-Received: from almasrymina.c.googlers.com ([fda3:e722:ac3:cc00:20:ed76:c0a8:4bc5]) (user=almasrymina job=sendgmr) by 2002:a25:cecb:0:b0:e0e:445b:606 with SMTP id 3f1490d57ef6-e1a78ab8b90mr6842276.0.1725065003928; Fri, 30 Aug 2024 17:43:23 -0700 (PDT) Date: Sat, 31 Aug 2024 00:43:01 +0000 In-Reply-To: <20240831004313.3713467-1-almasrymina@google.com> Precedence: bulk X-Mailing-List: linux-mips@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20240831004313.3713467-1-almasrymina@google.com> X-Mailer: git-send-email 2.46.0.469.g59c65b2a67-goog Message-ID: <20240831004313.3713467-2-almasrymina@google.com> Subject: [PATCH net-next v24 01/13] netdev: add netdev_rx_queue_restart() From: Mina Almasry To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org, linux-doc@vger.kernel.org, linux-alpha@vger.kernel.org, linux-mips@vger.kernel.org, linux-parisc@vger.kernel.org, sparclinux@vger.kernel.org, linux-trace-kernel@vger.kernel.org, linux-arch@vger.kernel.org, bpf@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-media@vger.kernel.org, dri-devel@lists.freedesktop.org Cc: Mina Almasry , Donald Hunter , Jakub Kicinski , "David S. Miller" , Eric Dumazet , Paolo Abeni , Jonathan Corbet , Richard Henderson , Ivan Kokshaysky , Matt Turner , Thomas Bogendoerfer , "James E.J. Bottomley" , Helge Deller , Andreas Larsson , Jesper Dangaard Brouer , Ilias Apalodimas , Steven Rostedt , Masami Hiramatsu , Mathieu Desnoyers , Arnd Bergmann , Steffen Klassert , Herbert Xu , David Ahern , Willem de Bruijn , " =?utf-8?b?QmrDtnJu?= =?utf-8?b?IFTDtnBlbA==?= " , Magnus Karlsson , Maciej Fijalkowski , Jonathan Lemon , Shuah Khan , Alexei Starovoitov , Daniel Borkmann , John Fastabend , Sumit Semwal , " =?utf-8?q?Christian_K=C3=B6nig?= " , Pavel Begunkov , David Wei , Jason Gunthorpe , Yunsheng Lin , Shailend Chand , Harshitha Ramamurthy , Shakeel Butt , Jeroen de Borst , Praveen Kaligineedi , Bagas Sanjaya , Christoph Hellwig , Nikolay Aleksandrov , Taehee Yoo Add netdev_rx_queue_restart(), which resets an rx queue using the queue API recently merged[1]. The queue API was merged to enable the core net stack to reset individual rx queues to actuate changes in the rx queue's configuration. In later patches in this series, we will use netdev_rx_queue_restart() to reset rx queues after binding or unbinding dmabuf configuration, which will cause reallocation of the page_pool to repopulate its memory using the new configuration. [1] https://lore.kernel.org/netdev/20240430231420.699177-1-shailend@google.com/T/ Signed-off-by: David Wei Signed-off-by: Mina Almasry Reviewed-by: Pavel Begunkov Reviewed-by: Jakub Kicinski --- v18: - Add more color to commit message (Xuan Zhuo). v17: - Use ASSERT_RTNL() (Jakub). v13: - Add reviewed-by from Pavel (thanks!) - Fixed comment (Pavel) v11: - Fix not checking dev->queue_mgmt_ops (Pavel). - Fix ndo_queue_mem_free call that passed the wrong pointer (David). v9: https://lore.kernel.org/all/20240502045410.3524155-4-dw@davidwei.uk/ (submitted by David). - fixed SPDX license identifier (Simon). - Rebased on top of merged queue API definition, and changed implementation to match that. - Replace rtnl_lock() with rtnl_is_locked() to make it useable from my netlink code where rtnl is already locked. --- include/net/netdev_rx_queue.h | 3 ++ net/core/Makefile | 1 + net/core/netdev_rx_queue.c | 74 +++++++++++++++++++++++++++++++++++ 3 files changed, 78 insertions(+) create mode 100644 net/core/netdev_rx_queue.c diff --git a/include/net/netdev_rx_queue.h b/include/net/netdev_rx_queue.h index aa1716fb0e53..e78ca52d67fb 100644 --- a/include/net/netdev_rx_queue.h +++ b/include/net/netdev_rx_queue.h @@ -54,4 +54,7 @@ get_netdev_rx_queue_index(struct netdev_rx_queue *queue) return index; } #endif + +int netdev_rx_queue_restart(struct net_device *dev, unsigned int rxq); + #endif diff --git a/net/core/Makefile b/net/core/Makefile index 62be9aef2528..f82232b358a2 100644 --- a/net/core/Makefile +++ b/net/core/Makefile @@ -19,6 +19,7 @@ obj-$(CONFIG_NETDEV_ADDR_LIST_TEST) += dev_addr_lists_test.o obj-y += net-sysfs.o obj-y += hotdata.o +obj-y += netdev_rx_queue.o obj-$(CONFIG_PAGE_POOL) += page_pool.o page_pool_user.o obj-$(CONFIG_PROC_FS) += net-procfs.o obj-$(CONFIG_NET_PKTGEN) += pktgen.o diff --git a/net/core/netdev_rx_queue.c b/net/core/netdev_rx_queue.c new file mode 100644 index 000000000000..da11720a5983 --- /dev/null +++ b/net/core/netdev_rx_queue.c @@ -0,0 +1,74 @@ +// SPDX-License-Identifier: GPL-2.0-or-later + +#include +#include +#include + +int netdev_rx_queue_restart(struct net_device *dev, unsigned int rxq_idx) +{ + void *new_mem, *old_mem; + int err; + + if (!dev->queue_mgmt_ops || !dev->queue_mgmt_ops->ndo_queue_stop || + !dev->queue_mgmt_ops->ndo_queue_mem_free || + !dev->queue_mgmt_ops->ndo_queue_mem_alloc || + !dev->queue_mgmt_ops->ndo_queue_start) + return -EOPNOTSUPP; + + ASSERT_RTNL(); + + new_mem = kvzalloc(dev->queue_mgmt_ops->ndo_queue_mem_size, GFP_KERNEL); + if (!new_mem) + return -ENOMEM; + + old_mem = kvzalloc(dev->queue_mgmt_ops->ndo_queue_mem_size, GFP_KERNEL); + if (!old_mem) { + err = -ENOMEM; + goto err_free_new_mem; + } + + err = dev->queue_mgmt_ops->ndo_queue_mem_alloc(dev, new_mem, rxq_idx); + if (err) + goto err_free_old_mem; + + err = dev->queue_mgmt_ops->ndo_queue_stop(dev, old_mem, rxq_idx); + if (err) + goto err_free_new_queue_mem; + + err = dev->queue_mgmt_ops->ndo_queue_start(dev, new_mem, rxq_idx); + if (err) + goto err_start_queue; + + dev->queue_mgmt_ops->ndo_queue_mem_free(dev, old_mem); + + kvfree(old_mem); + kvfree(new_mem); + + return 0; + +err_start_queue: + /* Restarting the queue with old_mem should be successful as we haven't + * changed any of the queue configuration, and there is not much we can + * do to recover from a failure here. + * + * WARN if we fail to recover the old rx queue, and at least free + * old_mem so we don't also leak that. + */ + if (dev->queue_mgmt_ops->ndo_queue_start(dev, old_mem, rxq_idx)) { + WARN(1, + "Failed to restart old queue in error path. RX queue %d may be unhealthy.", + rxq_idx); + dev->queue_mgmt_ops->ndo_queue_mem_free(dev, old_mem); + } + +err_free_new_queue_mem: + dev->queue_mgmt_ops->ndo_queue_mem_free(dev, new_mem); + +err_free_old_mem: + kvfree(old_mem); + +err_free_new_mem: + kvfree(new_mem); + + return err; +}