From patchwork Wed Dec 13 11:19:46 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jesper Dangaard Brouer X-Patchwork-Id: 847936 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 3yxZ3X6wcZz9s81 for ; Wed, 13 Dec 2017 22:19:52 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752734AbdLMLTu (ORCPT ); Wed, 13 Dec 2017 06:19:50 -0500 Received: from mx1.redhat.com ([209.132.183.28]:46076 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751865AbdLMLTr (ORCPT ); Wed, 13 Dec 2017 06:19:47 -0500 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id CE56964075; Wed, 13 Dec 2017 11:19:47 +0000 (UTC) Received: from firesoul.localdomain (ovpn-200-38.brq.redhat.com [10.40.200.38]) by smtp.corp.redhat.com (Postfix) with ESMTP id 429AE7E206; Wed, 13 Dec 2017 11:19:47 +0000 (UTC) Received: from [10.10.10.1] (localhost [IPv6:::1]) by firesoul.localdomain (Postfix) with ESMTP id 687A433178FDB; Wed, 13 Dec 2017 12:19:46 +0100 (CET) Subject: [bpf-next V1-RFC PATCH 05/14] xdp/qede: setup xdp_rxq_info and intro xdp_rxq_info_is_reg From: Jesper Dangaard Brouer To: Daniel Borkmann , Alexei Starovoitov Cc: bjorn.topel@intel.com, netdev@vger.kernel.org, Jesper Dangaard Brouer , Ariel Elior , dsahern@gmail.com, gospo@broadcom.com, everest-linux-l2@cavium.com, michael.chan@broadcom.com Date: Wed, 13 Dec 2017 12:19:46 +0100 Message-ID: <151316398635.14967.13125869420970564092.stgit@firesoul> In-Reply-To: <151316391502.14967.13292358380181773729.stgit@firesoul> References: <151316391502.14967.13292358380181773729.stgit@firesoul> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.25]); Wed, 13 Dec 2017 11:19:47 +0000 (UTC) Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The driver code qede_free_fp_array() depend on kfree() can be called with a NULL pointer. This stems from the qede_alloc_fp_array() function which either (kz)alloc memory for fp->txq or fp->rxq. This also simplifies error handling code in case of memory allocation failures, but xdp_rxq_info_unreg need to know the difference. Introduce xdp_rxq_info_is_reg() to handle if a memory allocation fails and detect this is the failure path by seeing that xdp_rxq_info was not registred yet, which first happens after successful alloaction in qede_init_fp(). Driver hook points for xdp_rxq_info: * init+reg: qede_init_fp * unreg : qede_free_fp_array Tested on actual hardware with samples/bpf program. Cc: everest-linux-l2@cavium.com Cc: Ariel Elior Signed-off-by: Jesper Dangaard Brouer --- drivers/net/ethernet/qlogic/qede/qede.h | 2 ++ drivers/net/ethernet/qlogic/qede/qede_fp.c | 1 + drivers/net/ethernet/qlogic/qede/qede_main.c | 12 ++++++++++++ include/net/xdp.h | 1 + net/core/xdp.c | 11 +++++++++++ 5 files changed, 27 insertions(+) diff --git a/drivers/net/ethernet/qlogic/qede/qede.h b/drivers/net/ethernet/qlogic/qede/qede.h index a3a70ade411f..62f47736511b 100644 --- a/drivers/net/ethernet/qlogic/qede/qede.h +++ b/drivers/net/ethernet/qlogic/qede/qede.h @@ -40,6 +40,7 @@ #include #include #include +#include #include #include #ifdef CONFIG_RFS_ACCEL @@ -345,6 +346,7 @@ struct qede_rx_queue { u64 xdp_no_pass; void *handle; + struct xdp_rxq_info xdp_rxq; }; union db_prod { diff --git a/drivers/net/ethernet/qlogic/qede/qede_fp.c b/drivers/net/ethernet/qlogic/qede/qede_fp.c index 48ec4c56cddf..dafc079ab6b9 100644 --- a/drivers/net/ethernet/qlogic/qede/qede_fp.c +++ b/drivers/net/ethernet/qlogic/qede/qede_fp.c @@ -1006,6 +1006,7 @@ static bool qede_rx_xdp(struct qede_dev *edev, xdp.data = xdp.data_hard_start + *data_offset; xdp_set_data_meta_invalid(&xdp); xdp.data_end = xdp.data + *len; + xdp.rxq = &rxq->xdp_rxq; /* Queues always have a full reset currently, so for the time * being until there's atomic program replace just mark read diff --git a/drivers/net/ethernet/qlogic/qede/qede_main.c b/drivers/net/ethernet/qlogic/qede/qede_main.c index 57332b3e5e64..a7264fdf4112 100644 --- a/drivers/net/ethernet/qlogic/qede/qede_main.c +++ b/drivers/net/ethernet/qlogic/qede/qede_main.c @@ -762,6 +762,12 @@ static void qede_free_fp_array(struct qede_dev *edev) fp = &edev->fp_array[i]; kfree(fp->sb_info); + /* Handle mem alloc failure case where qede_init_fp + * didn't register xdp_rxq_info yet. + * Implicit only (fp->type & QEDE_FASTPATH_RX) + */ + if (fp->rxq && xdp_rxq_info_is_reg(&fp->rxq->xdp_rxq)) + xdp_rxq_info_unreg(&fp->rxq->xdp_rxq); kfree(fp->rxq); kfree(fp->xdp_tx); kfree(fp->txq); @@ -1498,6 +1504,12 @@ static void qede_init_fp(struct qede_dev *edev) else fp->rxq->data_direction = DMA_FROM_DEVICE; fp->rxq->dev = &edev->pdev->dev; + + /* XDP RX-queue info */ + xdp_rxq_info_init(&fp->rxq->xdp_rxq); + fp->rxq->xdp_rxq.dev = edev->ndev; + fp->rxq->xdp_rxq.queue_index = fp->rxq->rxq_id; + xdp_rxq_info_reg(&fp->rxq->xdp_rxq); } if (fp->type & QEDE_FASTPATH_TX) { diff --git a/include/net/xdp.h b/include/net/xdp.h index 5be560d943e1..106ec8ed4db5 100644 --- a/include/net/xdp.h +++ b/include/net/xdp.h @@ -42,6 +42,7 @@ struct xdp_rxq_info { void xdp_rxq_info_init(struct xdp_rxq_info *xdp_rxq); void xdp_rxq_info_reg(struct xdp_rxq_info *xdp_rxq); void xdp_rxq_info_unreg(struct xdp_rxq_info *xdp_rxq); +bool xdp_rxq_info_is_reg(struct xdp_rxq_info *xdp_rxq); /** * DOC: XDP RX-queue type diff --git a/net/core/xdp.c b/net/core/xdp.c index 2a111f5987f6..f0203b8fc04c 100644 --- a/net/core/xdp.c +++ b/net/core/xdp.c @@ -44,3 +44,14 @@ void xdp_rxq_info_reg(struct xdp_rxq_info *xdp_rxq) xdp_rxq->reg_state = REG_STATE_REGISTRED; } EXPORT_SYMBOL_GPL(xdp_rxq_info_reg); + +bool xdp_rxq_info_is_reg(struct xdp_rxq_info *xdp_rxq) +{ + if (!xdp_rxq) { + WARN(1, "API violation, xdp_rxq is NULL"); + return false; + } + + return (xdp_rxq->reg_state == REG_STATE_REGISTRED); +} +EXPORT_SYMBOL_GPL(xdp_rxq_info_is_reg);