From nobody Thu Apr 2 18:03:54 2026 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 2E980C6FA8E for ; Wed, 21 Sep 2022 13:57:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230218AbiIUN5q (ORCPT ); Wed, 21 Sep 2022 09:57:46 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:53388 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229766AbiIUN5o (ORCPT ); Wed, 21 Sep 2022 09:57:44 -0400 Received: from mail-wm1-x332.google.com (mail-wm1-x332.google.com [IPv6:2a00:1450:4864:20::332]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3184D7B1C0; Wed, 21 Sep 2022 06:57:43 -0700 (PDT) Received: by mail-wm1-x332.google.com with SMTP id e10-20020a05600c4e4a00b003b4eff4ab2cso3479344wmq.4; Wed, 21 Sep 2022 06:57:43 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.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; bh=q3YuTWNeJ5V53+QAPS3mdAfc+O8icEhJa5RM3K6ShEo=; b=gAZIahSfDNJkKJKwdJaz2NBkb9+tuO7Wy18NzxGinte2r5STvaiHBFSyMfkHEZBdU9 Dqsz6swLhfr8D9Tl+VF4Re9bIcXkyX/y8OWZQlBQ1p8vVfhHUXdZ8eJquJlontgICkM6 YRRKhJXZJ1ggcUNnpUKOysif2t64DJyL0/5DE6fiGWoPVJdzYMT5/IOSV3+4WdIynO1+ xiZYdh0iUlrX+AuMwUtrJsBxEnf406EwfVJ6jtvVvzaI3OOo9TrBuZjW9C0UnDjEA0Zm E520WHVp+QfGSy8FgkSMcEPVmvmpD4RmwTg7Q9kisTH8UbOMgmXQ7K7RYcMKQclWteXk 5AZg== 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; bh=q3YuTWNeJ5V53+QAPS3mdAfc+O8icEhJa5RM3K6ShEo=; b=WL7H9zBEMFGvOE244GJz0ILuLKcMjHRlfwoVI5CdZx3AnGFUsQC+yZ9U+rq/Z5+xp9 vuskBjR/GjjFC9flG1h6Jh9TZkFjClQQx1Z1vAs9cXldEIbwb2LP3x8/j7ZEOiL5iryI euy/L9RdtAatiOQoIp7i+hWGExAFFrQihhWRjpgabRT1Z1u+UHe6BiWCaYdJ3TRFX/+Z EgzUayn3UQJ7/ZMOZ7ZQud8BTlmytSaMg7OHcr1YFY7iTpInW8JfK22qfhkxMHcHT3lw D5S+iE6FmsD3ITOMQMlTDvu/SR2r50E7JmR9QGzZDcv1iuvKgxWAOPThJesL5IfDd8TM jFrQ== X-Gm-Message-State: ACrzQf13M8B+GBHEKO6l8szrW9eIzh+6XhdGwCNoH3oriHJueUkw/Uvh admozJTGYHCOUYRDkV7oWKI= X-Google-Smtp-Source: AMsMyM4AQQH++LbiQAXOC8PLrRqbzi3zXVVXUZFyUw8511UJr87GRu2J3/g/gBVqsqD0Yv4iHXC/qg== X-Received: by 2002:a1c:4b05:0:b0:3b4:90c1:e249 with SMTP id y5-20020a1c4b05000000b003b490c1e249mr6144609wma.201.1663768661560; Wed, 21 Sep 2022 06:57:41 -0700 (PDT) Received: from ipe420-102 ([2a00:1398:4:ac00:ec4:7aff:fe32:721b]) by smtp.gmail.com with ESMTPSA id f11-20020a05600c4e8b00b003b340f00f10sm3611129wmq.31.2022.09.21.06.57.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 21 Sep 2022 06:57:41 -0700 (PDT) From: Jalal Mostafa To: maciej.fijalkowski@intel.com, netdev@vger.kernel.org, bpf@vger.kernel.org Cc: bjorn@kernel.org, magnus.karlsson@intel.com, jonathan.lemon@gmail.com, davem@davemloft.net, edumazet@google.com, kuba@kernel.org, pabeni@redhat.com, daniel@iogearbox.net, john.fastabend@gmail.com, hawk@kernel.org, ast@kernel.org, linux-kernel@vger.kernel.org, jalal.mostafa@kit.edu, jalal.a.mostapha@gmail.com Subject: [PATCH bpf v3] xsk: inherit need_wakeup flag for shared sockets Date: Wed, 21 Sep 2022 13:57:01 +0000 Message-Id: <20220921135701.10199-1-jalal.a.mostapha@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The flag for need_wakeup is not set for xsks with `XDP_SHARED_UMEM` flag and of different queue ids and/or devices. They should inherit the flag from the first socket buffer pool since no flags can be specified once `XDP_SHARED_UMEM` is specified. Fixes: b5aea28dca134 ("xsk: Add shared umem support between queue ids") Signed-off-by: Jalal Mostafa Acked-by: Magnus Karlsson --- include/net/xsk_buff_pool.h | 2 +- net/xdp/xsk.c | 4 ++-- net/xdp/xsk_buff_pool.c | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/include/net/xsk_buff_pool.h b/include/net/xsk_buff_pool.h index 647722e847b4..f787c3f524b0 100644 --- a/include/net/xsk_buff_pool.h +++ b/include/net/xsk_buff_pool.h @@ -95,7 +95,7 @@ struct xsk_buff_pool *xp_create_and_assign_umem(struct xd= p_sock *xs, struct xdp_umem *umem); int xp_assign_dev(struct xsk_buff_pool *pool, struct net_device *dev, u16 queue_id, u16 flags); -int xp_assign_dev_shared(struct xsk_buff_pool *pool, struct xdp_umem *umem, +int xp_assign_dev_shared(struct xsk_buff_pool *pool, struct xdp_sock *umem= _xs, struct net_device *dev, u16 queue_id); int xp_alloc_tx_descs(struct xsk_buff_pool *pool, struct xdp_sock *xs); void xp_destroy(struct xsk_buff_pool *pool); diff --git a/net/xdp/xsk.c b/net/xdp/xsk.c index 5b4ce6ba1bc7..7bada4e8460b 100644 --- a/net/xdp/xsk.c +++ b/net/xdp/xsk.c @@ -954,8 +954,8 @@ static int xsk_bind(struct socket *sock, struct sockadd= r *addr, int addr_len) goto out_unlock; } =20 - err =3D xp_assign_dev_shared(xs->pool, umem_xs->umem, - dev, qid); + err =3D xp_assign_dev_shared(xs->pool, umem_xs, dev, + qid); if (err) { xp_destroy(xs->pool); xs->pool =3D NULL; diff --git a/net/xdp/xsk_buff_pool.c b/net/xdp/xsk_buff_pool.c index a71a8c6edf55..ed6c71826d31 100644 --- a/net/xdp/xsk_buff_pool.c +++ b/net/xdp/xsk_buff_pool.c @@ -212,17 +212,18 @@ int xp_assign_dev(struct xsk_buff_pool *pool, return err; } =20 -int xp_assign_dev_shared(struct xsk_buff_pool *pool, struct xdp_umem *umem, +int xp_assign_dev_shared(struct xsk_buff_pool *pool, struct xdp_sock *umem= _xs, struct net_device *dev, u16 queue_id) { u16 flags; + struct xdp_umem *umem =3D umem_xs->umem; =20 /* One fill and completion ring required for each queue id. */ if (!pool->fq || !pool->cq) return -EINVAL; =20 flags =3D umem->zc ? XDP_ZEROCOPY : XDP_COPY; - if (pool->uses_need_wakeup) + if (umem_xs->pool->uses_need_wakeup) flags |=3D XDP_USE_NEED_WAKEUP; =20 return xp_assign_dev(pool, dev, queue_id, flags); --=20 2.34.1