Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Wed, 21 Sep 2022 14:16:39 +0200
From:   Maciej Fijalkowski <maciej.fijalkowski@intel.com>
To:     Magnus Karlsson <magnus.karlsson@gmail.com>
CC:     Jalal Mostafa <jalal.a.mostapha@gmail.com>,
        <netdev@vger.kernel.org>, <bpf@vger.kernel.org>,
        <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>, <linux-kernel@vger.kernel.org>,
        <jalal.mostafa@kit.edu>
Subject: Re: [PATCH bpf v2] xsk: inherit need_wakeup flag for shared sockets
Message-ID: <YysApyiP4S3xdT8H@boxer>
References: <Yymq2WLA6q6TxnNq@ipe420-102>
 <CAJ8uoz2D9mGjZzo6SmAWtgbb0A3AB_Nk4eYXajenv3VDBA11=A@mail.gmail.com>
Content-Type: text/plain; charset="us-ascii"
Content-Disposition: inline
In-Reply-To: <CAJ8uoz2D9mGjZzo6SmAWtgbb0A3AB_Nk4eYXajenv3VDBA11=A@mail.gmail.com>
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?qUZlIHciofcd4CWGfc8fgBszBYBaDlmSbOW4dD1qMUXNikPiXQtNW8hdhOO/?=
 =?us-ascii?Q?NeyU7yyGvudHRxbKMTpag3u8MhXM81P3jpV7f9zM1oMDMQiop7N09bc2nJUL?=
 =?us-ascii?Q?Yg0T4NPBb0krFcwV7HV+WTfuYNnpJWjXIYTUe/bNbeQECBmHQkV1cJml+gME?=
 =?us-ascii?Q?Aill/3vD5kZc04VvgdFKOwE0TFAXnoQh8ky2Rmjnx3e6l5RMgro0xiPqqWrV?=
 =?us-ascii?Q?0EFX83FSjqooUDOQxYkkcIDPwmmzdX7NxhrIqKcHwV2S+e/lSQovJeZwZTfD?=
 =?us-ascii?Q?e6SnJiik/yOWuE6k4pwzMgfMpzL/mVfJdozRczTxoKWgYiKbGjJkx/LRljsp?=
 =?us-ascii?Q?YKqKIfSxbYxNd9SoBaF9L4eO/Uh57WWYx0qsaPhOazHBkkBqIvbdS5a8RZdX?=
 =?us-ascii?Q?MJvH2zT8/0kietRrxtj39VW1yT8YG7Ln7Sn9s/3HdFq8r3XVKmmtvOx19me4?=
 =?us-ascii?Q?FTBF2ABOMXPvgDIk/R4rh5JAe/Dqsbmx+blKB5+QtIzQPb1COZLsT3unOKB6?=
 =?us-ascii?Q?8C9xXz0pB0Iz4FC2BujokyZlWm0azI4BatxO/+m8WDIXYe+N5YWhYxhz1c51?=
 =?us-ascii?Q?1Df+T1tp/cIFFc3KCKsFPRLVFir0ejJvW0RrfY8IudIIblLVZwQra1Bx4srE?=
 =?us-ascii?Q?oOzyIejSRKUBH6qsJpeSxaKdTFV4i4Ts29zxVFSRA+l4qWLsBpCoJM+nJU6c?=
 =?us-ascii?Q?xD7rq5pMfifhgvTvrmbR4pnXiecimAszzG+UGgJgJo1qbcZreK7NHtXSewXs?=
 =?us-ascii?Q?BFZF5ccbYon6Ak1R1Dx5kM4Bq6GGLeASB/Rb+4Q9xjhRjVIOKUrjO4utNPSV?=
 =?us-ascii?Q?NLCiuCp5XibrNeMqyqeYT8wlspROQw6yGtVuCJF1WGn2gNGw+OImGsXykhPt?=
 =?us-ascii?Q?PgaCdkQyS2Y+WQ9GlC8lQon5TKLR8aBCGSWq6aVCk6Dt87WQY6DyXQUjaH2e?=
 =?us-ascii?Q?1UYCiYYEOVnlC4Alme/fTpxu92obfr+PaT+NLEMAydDJJgsHEqq1fUVZAZCj?=
 =?us-ascii?Q?ho3hprQQG2DGGUrSt3Op5DwLOWuq1DK7fLuztdKAuRnkI5OQ6gkxwTVsTcJF?=
 =?us-ascii?Q?Ohox8LbQIbcYOtp+LeXxNlHjBJgOboRdDKkXpJ7lDKHHP2n0V+Dy2HfEnvr5?=
 =?us-ascii?Q?Z6fSt2Q0tdobhPKU1xretZvqR+ExAYljGa6PSVE6J19Q6v52WlA8EHLzuU6C?=
 =?us-ascii?Q?cifWFM/1rA/8vs8tZYiJKl05GXcGFmv4Bs0tV/GBSReZXIMLSpYDEMeYQQSN?=
 =?us-ascii?Q?w7ypkc5GQGzBT0pSpFdJs9PM75MGDT+u+7AnysNF5sEF3ass//Txre/EHY/+?=
 =?us-ascii?Q?j7J8JC6TwITNueLp3ohfH5+0+V1JZuLTtw5ertlTQbHPI4uBaUMb4Hl29MRJ?=
 =?us-ascii?Q?JYZmXHSlABAEWbww/cSK3d10A04hhmwqsGR/5OhufTknV2JVWSLl6Gn8wMF3?=
 =?us-ascii?Q?3hqPZcry208k7+MgJFSFMbJhEpPafA5EjjFrs2/Ahwk0MFNC3sciCPKGF6kT?=
 =?us-ascii?Q?yNTo5PAxlI+UZV8My92O1QS+sr5HtqG+rlc+OwzV6nsf2gS8m1Ns5N5vYLPb?=
 =?us-ascii?Q?vsGeKoWPGBN1GrTfU6uLqAVnS32m8uZxCXDyXAExQ278Ao+lgG3/NTQVOuel?=
 =?us-ascii?Q?Cg=3D=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 01ba1279-5372-4b88-b0d3-08da9bcb2707
X-MS-Exchange-CrossTenant-AuthSource: DM4PR11MB6117.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 21 Sep 2022 12:16:46.3078
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: /DGbXU/w17GVl0k0iOsrZQYsrfb1DG/rOl5v/ZdcEQKsdIDcFK5/XzUuA+xOzVqQNYQBawYV3ep+41Gg+8JYLi8bqMgZf/XrnKTpaH37GKM=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH7PR11MB6029
X-OriginatorOrg: intel.com
X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,
        DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,
        SPF_HELO_NONE,SPF_NONE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Tue, Sep 20, 2022 at 03:34:19PM +0200, Magnus Karlsson wrote:
> On Tue, Sep 20, 2022 at 1:58 PM Jalal Mostafa
> <jalal.a.mostapha@gmail.com> wrote:
> >
> > 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. The issue is fixed
> > by creating a new function `xp_create_and_assign_umem_shared` to
> > create xsk_buff_pool for xsks with the shared umem flag set.

Hi Jalal,

Please update commit msg and remove reference to the new function that you
were creating on v1.

> 
> Thanks!
> 
> Acked-by: Magnus Karlsson <magnus.karlsson@intel.com>
> 
> > Fixes: b5aea28dca134 ("xsk: Add shared umem support between queue ids")
> > Signed-off-by: Jalal Mostafa <jalal.a.mostapha@gmail.com>
> > ---
> >  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 xdp_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 sockaddr *addr, int addr_len)
> >                                 goto out_unlock;
> >                         }
> >
> > -                       err = xp_assign_dev_shared(xs->pool, umem_xs->umem,
> > -                                                  dev, qid);
> > +                       err = xp_assign_dev_shared(xs->pool, umem_xs, dev,
> > +                                                  qid);
> >                         if (err) {
> >                                 xp_destroy(xs->pool);
> >                                 xs->pool = 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;
> >  }
> >
> > -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 = umem_xs->umem;
> >
> >         /* One fill and completion ring required for each queue id. */
> >         if (!pool->fq || !pool->cq)
> >                 return -EINVAL;
> >
> >         flags = umem->zc ? XDP_ZEROCOPY : XDP_COPY;
> > -       if (pool->uses_need_wakeup)
> > +       if (umem_xs->pool->uses_need_wakeup)
> >                 flags |= XDP_USE_NEED_WAKEUP;
> >
> >         return xp_assign_dev(pool, dev, queue_id, flags);
> > --
> > 2.34.1
> >