Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
MIME-Version: 1.0
References: <1607071819-34127-1-git-send-email-zhangchangzhong@huawei.com>
In-Reply-To: <1607071819-34127-1-git-send-email-zhangchangzhong@huawei.com>
From:   Magnus Karlsson <magnus.karlsson@gmail.com>
Date:   Fri, 4 Dec 2020 10:01:47 +0100
Message-ID: <CAJ8uoz0LCkR+zHKSto9JyTqeybRXqF1SbH_B6cBHu9n5r-UXKA@mail.gmail.com>
Subject: Re: [PATCH net] xsk: Fix error return code in __xp_assign_dev()
To:     Zhang Changzhong <zhangchangzhong@huawei.com>
Cc:     =?UTF-8?B?QmrDtnJuIFTDtnBlbA==?= <bjorn.topel@intel.com>,
        Magnus Karlsson <magnus.karlsson@intel.com>,
        Jonathan Lemon <jonathan.lemon@gmail.com>,
        "David S. Miller" <davem@davemloft.net>,
        Jakub Kicinski <kuba@kernel.org>,
        Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        Jesper Dangaard Brouer <hawk@kernel.org>,
        John Fastabend <john.fastabend@gmail.com>,
        Network Development <netdev@vger.kernel.org>,
        bpf <bpf@vger.kernel.org>,
        open list <linux-kernel@vger.kernel.org>
Content-Type: text/plain; charset="UTF-8"
Precedence: bulk

On Fri, Dec 4, 2020 at 9:49 AM Zhang Changzhong
<zhangchangzhong@huawei.com> wrote:
>
> Fix to return a negative error code from the error handling
> case instead of 0, as done elsewhere in this function.
>
> Fixes: 921b68692abb ("xsk: Enable sharing of dma mappings")
> Reported-by: Hulk Robot <hulkci@huawei.com>
> Signed-off-by: Zhang Changzhong <zhangchangzhong@huawei.com>
> ---
>  net/xdp/xsk_buff_pool.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/net/xdp/xsk_buff_pool.c b/net/xdp/xsk_buff_pool.c
> index 9287edd..d5adeee 100644
> --- a/net/xdp/xsk_buff_pool.c
> +++ b/net/xdp/xsk_buff_pool.c
> @@ -175,6 +175,7 @@ static int __xp_assign_dev(struct xsk_buff_pool *pool,
>
>         if (!pool->dma_pages) {
>                 WARN(1, "Driver did not DMA map zero-copy buffers");
> +               err = -EINVAL;

Good catch! My intention here by not setting err is that it should
fall back to copy mode, which it does. The problem is that the
force_zc flag is disregarded when err is not set (see exit code below)
and your patch fixes that. If force_zc is set, we should exit out with
an error, not fall back. Could you please write about this in your
cover letter and send a v2?

BTW, what is the "Hulk Robot" that is in your Reported-by tag?

Thank you: Magnus

err_unreg_xsk:
        xp_disable_drv_zc(pool);
err_unreg_pool:
        if (!force_zc)
                err = 0; /* fallback to copy mode */
        if (err)
                xsk_clear_pool_at_qid(netdev, queue_id);
        return err;

>                 goto err_unreg_xsk;
>         }
>         pool->umem->zc = true;
> --
> 2.9.5
>