From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-12.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 693E7C4743D for ; Tue, 8 Jun 2021 11:08:41 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 4B8E1610FB for ; Tue, 8 Jun 2021 11:08:41 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231792AbhFHLKc (ORCPT ); Tue, 8 Jun 2021 07:10:32 -0400 Received: from mail-pg1-f169.google.com ([209.85.215.169]:38536 "EHLO mail-pg1-f169.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231303AbhFHLKb (ORCPT ); Tue, 8 Jun 2021 07:10:31 -0400 Received: by mail-pg1-f169.google.com with SMTP id 6so16221740pgk.5; Tue, 08 Jun 2021 04:08:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=UJVsqI/ei0WczshYuB8pLAQsFgqQWwx9v5zxVqgopwU=; b=B9ab52pbsKXDXa+qRWwLhBk1hn1Q5Y5Epsog2G5yDfhkg5IOo9jKJ2yFIQFwMAzGud AcSRIaZ8KgYDCs+rim+4y/6lRxahUee70hAve0OSKrKrsbZZQij7nBPhyvvDc1HBnS6M ngcCKuustZvvUxVhpJYky5CuYcYU4kUvomXBT9SOle0uV5+XZoXfXEQH4t9GhG2hbRS3 Bj3KqAasLfgPV7LJBkffZQB5uBR+wC3S/r/+wrwD79PoJZgN9ov0Q6SlyNIkVznJzrKx VikGD3Fo8rv+94mK8O47KXO6kqFcS+lnDOMXrGGMWVpyB8mztLWH4TukVO7Hh8ZWKPf7 eXaA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=UJVsqI/ei0WczshYuB8pLAQsFgqQWwx9v5zxVqgopwU=; b=HUw/8bMBXZJWaXcNHSSIyXEuYo/qLlqkRjSN8CkC3ubQghE3vC4uUWXyVwGZifr5cm ahaFWnspBd2vVz0f5drpl66DzAHG5/k9b+IMVwHH7DNQiL8cujP82FXIGlpwDEgPOAnz LMP/6R5XN/+kY/uV2I90NZ1qW3atNWCoPm8MonRjavOOEf02cboymmmDEP+IFlQFZLfO xq8Je1PEjPiXKyi8qEuqviWy3gVd0B02vblaz7G42Fx4M1rfX2KYudXykmSlylKCqWtl L4tpJtE5QAzUCa61IehC6CmidqXy6Iu+MZTZvhXMWybSPZ/4UD/afsInNKVFxjRsQpW4 o5sA== X-Gm-Message-State: AOAM530W1bgvsqoODc/Ux9gqtu7bakhW4b9dM6g6mWokEOqn6cNYcoj9 Apr3jDSC3hCUo58fI5Vq1yuX9A1aCqOpkyxjMwU= X-Google-Smtp-Source: ABdhPJxjGu8PU0C2DW8HKf2a2BcxewJ3P/4FVJ4FKwCahJzQrzq27XcDUuxYrsnQ3WmcxDTGCfmmKI5172RPm/6SJlM= X-Received: by 2002:a63:4e4f:: with SMTP id o15mr22260611pgl.208.1623150442052; Tue, 08 Jun 2021 04:07:22 -0700 (PDT) MIME-Version: 1.0 References: <20210607122644.59021-1-wanghai38@huawei.com> In-Reply-To: <20210607122644.59021-1-wanghai38@huawei.com> From: Magnus Karlsson Date: Tue, 8 Jun 2021 13:07:11 +0200 Message-ID: Subject: Re: [Intel-wired-lan] [PATCH net] ixgbe, xsk: clean up the resources in ixgbe_xsk_pool_enable error path To: Wang Hai Cc: "Brandeburg, Jesse" , "Nguyen, Anthony L" , "David S. Miller" , Alexei Starovoitov , Jakub Kicinski , Daniel Borkmann , Jesper Dangaard Brouer , John Fastabend , Jeff Kirsher , jan.sokolowski@intel.com, "Karlsson, Magnus" , Network Development , bpf , intel-wired-lan , open list Content-Type: text/plain; charset="UTF-8" Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, Jun 7, 2021 at 2:17 PM Wang Hai wrote: > > In ixgbe_xsk_pool_enable(), if ixgbe_xsk_wakeup() fails, > We should restore the previous state and clean up the > resources. Add the missing clear af_xdp_zc_qps and unmap dma > to fix this bug. > > Fixes: d49e286d354e ("ixgbe: add tracking of AF_XDP zero-copy state for each queue pair") > Fixes: 4a9b32f30f80 ("ixgbe: fix potential RX buffer starvation for AF_XDP") > Signed-off-by: Wang Hai > --- > drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 5 ++++- > 1 file changed, 4 insertions(+), 1 deletion(-) Thanks Wang. Acked-by: Magnus Karlsson > diff --git a/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c b/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c > index 91ad5b902673..d912f14d2ba4 100644 > --- a/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c > +++ b/drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c > @@ -52,8 +52,11 @@ static int ixgbe_xsk_pool_enable(struct ixgbe_adapter *adapter, > > /* Kick start the NAPI context so that receiving will start */ > err = ixgbe_xsk_wakeup(adapter->netdev, qid, XDP_WAKEUP_RX); > - if (err) > + if (err) { > + clear_bit(qid, adapter->af_xdp_zc_qps); > + xsk_pool_dma_unmap(pool, IXGBE_RX_DMA_ATTR); > return err; > + } > } > > return 0; > -- > 2.17.1 > > _______________________________________________ > Intel-wired-lan mailing list > Intel-wired-lan@osuosl.org > https://lists.osuosl.org/mailman/listinfo/intel-wired-lan