From nobody Wed Jan 15 01:05:18 2025 Received: from mail-pj1-f73.google.com (mail-pj1-f73.google.com [209.85.216.73]) (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 D294D153BED for ; Mon, 9 Dec 2024 17:23:12 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.216.73 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733764995; cv=none; b=SpBypz0sdT5PkL3DPmQviE8l/2+Odu4lkXUl3o9zuQmBQHDNuOf/nd8JnPYpMOr6c3oFhHs1sO+2uu0QEVTkEmtv8ZI857gdYEBa1it/H2JkjqEfInXoy9LX7wsGH0EYgB8BgFiJ7MbjSNGPmBDSSjkuc79+m8SXCWwWN0pMH40= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1733764995; c=relaxed/simple; bh=inYtJTadn/ilQufeg2hRjROOpb6WnuRJ/R3Eo2kT9Ak=; h=Date:In-Reply-To:Mime-Version:References:Message-ID:Subject:From: To:Cc:Content-Type; b=aDum5rytqRjck85lYCkP7H99+ghqKsGSBNBFDqmmZJPj2FnFmc9YfMGsrHfU9AqV5pvt3MHoqPxJOJ+zb3EkfZkrH30gA3Uy31qXl8qzShUi5s/JKimqNq7RcmMDOUaH4vr4zb1PBx4JRvpxq2PqX9VMrji0wDCYVyFfbLvad9M= 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=Orq2XtT/; arc=none smtp.client-ip=209.85.216.73 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="Orq2XtT/" Received: by mail-pj1-f73.google.com with SMTP id 98e67ed59e1d1-2ef7fbd99a6so2262748a91.1 for ; Mon, 09 Dec 2024 09:23:12 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20230601; t=1733764992; x=1734369792; 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=rD4fHb5o8v+27TSL8zHXq3Z19Qh3ytPkt3LCpxEoKxE=; b=Orq2XtT/ERZSUjmtMsQzAA1Gw68J824uikYBYqoub078MfbsKcLSi3YJUkRFw1jpYx MIUOyAqWij26W5nMpzukQDiqB82hqF7eAmDTdO8q/tgMejRjVR96trbCIsEVFwYJchHa j5B84v/YJiDnZakJ3K2lsutaJNUZZFG1RD/9e2TnuezaIfaoRCuK7JFpr/fxQDREXC13 VooRM4uFI7IgNWzkZ5/e/WL0yS5qQaH8AnpPued8EXjwrFWM9a4LkAlo02bSjBkfHW6i jP1+rAHp5h1Wl2PjEm1brlVY5iTCNXRbFuZVtYz02Pn0jddRevgSzoa+NrBRd2lvheEO fLjw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1733764992; x=1734369792; 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=rD4fHb5o8v+27TSL8zHXq3Z19Qh3ytPkt3LCpxEoKxE=; b=X0nq+GuHIWkPknBZzLo0FD87TCxHIO0bycreYYvEs6gTMx+0Hp6byD2Zu7SOhY9KDM 8oa9+3pqgYCT7l227X/Ybyfi2mrOtQ9ZlgcpQdQP6NNEme+4te1X6GCkHMd4AjooUsyv PoJX0cxDglKbktFqcs9/odcw6mASv+r3o0Gc7mJ3+AR8p+HXx8MTOutRFCPMyBF08tzH PZpIUHb620WloFEQfwmpvael7+rM4yWUVLzTzyp/zqY2S0RwcbQA+LrKsdGoG8NjG3mH WW/e+8riu/DQRltYlaOh+c2jA4mpfHpfMlrb8wnNI89kT6bz6U9VnsevnETt1H3+GvXX CNLg== X-Forwarded-Encrypted: i=1; AJvYcCXJD4KeCV+DgLnPBgIY/mS1Nv0KCZuMr1moJtVEXOLKtuUerWA6PN79d7cqUvMOxLpBie8RfzoehY1x7RI=@vger.kernel.org X-Gm-Message-State: AOJu0YyGKVujsVCFfnQf7wt1JclrJK+isx7OBXBnARtdXsTFFxrvT/K1 cX4+VL7OWN8yLr/0mCADDQPQmjABEBaSzIZHm1ya+USApctrE6nSh4MMWH/b3YYU6GpvU1gufpN 1yebNY8eq0SnLue7n0y7o6w== X-Google-Smtp-Source: AGHT+IF/gnzzxrq5wZW7Oq+BE9snOE5665TQRiKiXV7o1WW6Cds5d4hj9kPz8o9cXdP519d70WJqMsaDSx1ufbKdtw== X-Received: from pjbpv2.prod.google.com ([2002:a17:90b:3c82:b0:2ef:82a8:7171]) (user=almasrymina job=prod-delivery.src-stubby-dispatcher) by 2002:a17:90b:50:b0:2ee:c797:e27f with SMTP id 98e67ed59e1d1-2ef6ab296e5mr18017086a91.36.1733764992288; Mon, 09 Dec 2024 09:23:12 -0800 (PST) Date: Mon, 9 Dec 2024 17:23:04 +0000 In-Reply-To: <20241209172308.1212819-1-almasrymina@google.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: Mime-Version: 1.0 References: <20241209172308.1212819-1-almasrymina@google.com> X-Mailer: git-send-email 2.47.0.338.g60cca15819-goog Message-ID: <20241209172308.1212819-2-almasrymina@google.com> Subject: [PATCH net-next v3 1/5] net: page_pool: rename page_pool_alloc_netmem to *_netmems From: Mina Almasry To: netdev@vger.kernel.org, Jakub Kicinski , Mina Almasry , Pavel Begunkov , Kaiyuan Zhang , Willem de Bruijn , Samiullah Khawaja , linux-doc@vger.kernel.org, linux-kernel@vger.kernel.org Cc: "David S. Miller" , Eric Dumazet , Paolo Abeni , Simon Horman , Jonathan Corbet , Jesper Dangaard Brouer , Ilias Apalodimas , Stanislav Fomichev Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" page_pool_alloc_netmem (without an s) was the mirror of page_pool_alloc_pages (with an s), which was confusing. Rename to page_pool_alloc_netmems so it's the mirror of page_pool_alloc_pages. Signed-off-by: Mina Almasry Acked-by: Stanislav Fomichev --- include/net/page_pool/types.h | 2 +- net/core/page_pool.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/net/page_pool/types.h b/include/net/page_pool/types.h index 1ea16b0e9c79..bd1170e16cff 100644 --- a/include/net/page_pool/types.h +++ b/include/net/page_pool/types.h @@ -242,7 +242,7 @@ struct page_pool { }; =20 struct page *page_pool_alloc_pages(struct page_pool *pool, gfp_t gfp); -netmem_ref page_pool_alloc_netmem(struct page_pool *pool, gfp_t gfp); +netmem_ref page_pool_alloc_netmems(struct page_pool *pool, gfp_t gfp); struct page *page_pool_alloc_frag(struct page_pool *pool, unsigned int *of= fset, unsigned int size, gfp_t gfp); netmem_ref page_pool_alloc_frag_netmem(struct page_pool *pool, diff --git a/net/core/page_pool.c b/net/core/page_pool.c index 4c85b77cfdac..3c0e19e13e64 100644 --- a/net/core/page_pool.c +++ b/net/core/page_pool.c @@ -574,7 +574,7 @@ static noinline netmem_ref __page_pool_alloc_pages_slow= (struct page_pool *pool, /* For using page_pool replace: alloc_pages() API calls, but provide * synchronization guarantee for allocation side. */ -netmem_ref page_pool_alloc_netmem(struct page_pool *pool, gfp_t gfp) +netmem_ref page_pool_alloc_netmems(struct page_pool *pool, gfp_t gfp) { netmem_ref netmem; =20 @@ -590,11 +590,11 @@ netmem_ref page_pool_alloc_netmem(struct page_pool *p= ool, gfp_t gfp) netmem =3D __page_pool_alloc_pages_slow(pool, gfp); return netmem; } -EXPORT_SYMBOL(page_pool_alloc_netmem); +EXPORT_SYMBOL(page_pool_alloc_netmems); =20 struct page *page_pool_alloc_pages(struct page_pool *pool, gfp_t gfp) { - return netmem_to_page(page_pool_alloc_netmem(pool, gfp)); + return netmem_to_page(page_pool_alloc_netmems(pool, gfp)); } EXPORT_SYMBOL(page_pool_alloc_pages); ALLOW_ERROR_INJECTION(page_pool_alloc_pages, NULL); @@ -957,7 +957,7 @@ netmem_ref page_pool_alloc_frag_netmem(struct page_pool= *pool, } =20 if (!netmem) { - netmem =3D page_pool_alloc_netmem(pool, gfp); + netmem =3D page_pool_alloc_netmems(pool, gfp); if (unlikely(!netmem)) { pool->frag_page =3D 0; return 0; --=20 2.47.0.338.g60cca15819-goog