From nobody Mon Nov 25 16:57:49 2024 Received: from szxga01-in.huawei.com (szxga01-in.huawei.com [45.249.212.187]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 1454F178CF6; Sat, 26 Oct 2024 03:57:50 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.187 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729915073; cv=none; b=gSoONY0uzIKgVz3wsqmWsyQv80AMjP91OF1esbzqsNad7CSn4IpAil9SBKo3hpa5BxeFNbWvx/V7oe1vjU+yC1iq/w3dVXwHEk6nEcemYpdA3RlPOy37a7IlFjWcHkxxVYJNtzc5h4i43jSj+I1C23cZEqFZwNOdq5+yTBsbDt8= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729915073; c=relaxed/simple; bh=HEdK7Cl/NMR0ubFOMazAruj8y/1j7/+ZqT5IBWle8NI=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=MM8LwBohlOnjdJ7aWPLJhD1T67Td3+kt23BBdYMXobmUQloJhS1ZD9y1cd2l/jMkSuiqzcayO1T2kSfjLrNK0reqJg+5+tFanBSXkBk9M1yYl2qdEYD4tpQQqFFf/4kZ/zk8YFuK/+NZFyzZx3SzD6MFERNuOlqpiD8TZf1gu9o= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.187 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.88.105]) by szxga01-in.huawei.com (SkyGuard) with ESMTP id 4Xb5RX3P6kzyTjN; Sat, 26 Oct 2024 11:56:08 +0800 (CST) Received: from dggpemf500002.china.huawei.com (unknown [7.185.36.57]) by mail.maildlp.com (Postfix) with ESMTPS id E7FF6140258; Sat, 26 Oct 2024 11:57:42 +0800 (CST) Received: from huawei.com (10.175.101.6) by dggpemf500002.china.huawei.com (7.185.36.57) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Sat, 26 Oct 2024 11:57:41 +0800 From: Yue Haibing To: , , , , , , , , , , , , , , , , , CC: , , , , Subject: [PATCH v4 net-next 1/4] igc: Fix passing 0 to ERR_PTR in igc_xdp_run_prog() Date: Sat, 26 Oct 2024 12:12:46 +0800 Message-ID: <20241026041249.1267664-2-yuehaibing@huawei.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241026041249.1267664-1-yuehaibing@huawei.com> References: <20241026041249.1267664-1-yuehaibing@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: dggems702-chm.china.huawei.com (10.3.19.179) To dggpemf500002.china.huawei.com (7.185.36.57) Content-Type: text/plain; charset="utf-8" igc_xdp_run_prog() converts customed xdp action to a negative error code with the sk_buff pointer type which be checked with IS_ERR in igc_clean_rx_irq(). Remove this error pointer handing instead use plain int return value to fix this smatch warnings: drivers/net/ethernet/intel/igc/igc_main.c:2533 igc_xdp_run_prog() warn: passing zero to 'ERR_PTR' Fixes: 26575105d6ed ("igc: Add initial XDP support") Reviewed-by: Maciej Fijalkowski Reviewed-by: Jacob Keller Signed-off-by: Yue Haibing Reviewed-by: Simon Horman Tested-by: Avigail Dahan --- drivers/net/ethernet/intel/igc/igc_main.c | 20 +++++++------------- 1 file changed, 7 insertions(+), 13 deletions(-) diff --git a/drivers/net/ethernet/intel/igc/igc_main.c b/drivers/net/ethern= et/intel/igc/igc_main.c index 6e70bca15db1..5e44c2546a12 100644 --- a/drivers/net/ethernet/intel/igc/igc_main.c +++ b/drivers/net/ethernet/intel/igc/igc_main.c @@ -2123,10 +2123,6 @@ static bool igc_cleanup_headers(struct igc_ring *rx_= ring, union igc_adv_rx_desc *rx_desc, struct sk_buff *skb) { - /* XDP packets use error pointer so abort at this point */ - if (IS_ERR(skb)) - return true; - if (unlikely(igc_test_staterr(rx_desc, IGC_RXDEXT_STATERR_RXE))) { struct net_device *netdev =3D rx_ring->netdev; =20 @@ -2515,8 +2511,7 @@ static int __igc_xdp_run_prog(struct igc_adapter *ada= pter, } } =20 -static struct sk_buff *igc_xdp_run_prog(struct igc_adapter *adapter, - struct xdp_buff *xdp) +static int igc_xdp_run_prog(struct igc_adapter *adapter, struct xdp_buff *= xdp) { struct bpf_prog *prog; int res; @@ -2530,7 +2525,7 @@ static struct sk_buff *igc_xdp_run_prog(struct igc_ad= apter *adapter, res =3D __igc_xdp_run_prog(adapter, prog, xdp); =20 out: - return ERR_PTR(-res); + return res; } =20 /* This function assumes __netif_tx_lock is held by the caller. */ @@ -2585,6 +2580,7 @@ static int igc_clean_rx_irq(struct igc_q_vector *q_ve= ctor, const int budget) struct sk_buff *skb =3D rx_ring->skb; u16 cleaned_count =3D igc_desc_unused(rx_ring); int xdp_status =3D 0, rx_buffer_pgcnt; + int xdp_res =3D 0; =20 while (likely(total_packets < budget)) { struct igc_xdp_buff ctx =3D { .rx_ts =3D NULL }; @@ -2630,12 +2626,10 @@ static int igc_clean_rx_irq(struct igc_q_vector *q_= vector, const int budget) xdp_buff_clear_frags_flag(&ctx.xdp); ctx.rx_desc =3D rx_desc; =20 - skb =3D igc_xdp_run_prog(adapter, &ctx.xdp); + xdp_res =3D igc_xdp_run_prog(adapter, &ctx.xdp); } =20 - if (IS_ERR(skb)) { - unsigned int xdp_res =3D -PTR_ERR(skb); - + if (xdp_res) { switch (xdp_res) { case IGC_XDP_CONSUMED: rx_buffer->pagecnt_bias++; @@ -2657,7 +2651,7 @@ static int igc_clean_rx_irq(struct igc_q_vector *q_ve= ctor, const int budget) skb =3D igc_construct_skb(rx_ring, rx_buffer, &ctx); =20 /* exit if we failed to retrieve a buffer */ - if (!skb) { + if (!xdp_res && !skb) { rx_ring->rx_stats.alloc_failed++; rx_buffer->pagecnt_bias++; set_bit(IGC_RING_FLAG_RX_ALLOC_FAILED, &rx_ring->flags); @@ -2672,7 +2666,7 @@ static int igc_clean_rx_irq(struct igc_q_vector *q_ve= ctor, const int budget) continue; =20 /* verify the packet layout is correct */ - if (igc_cleanup_headers(rx_ring, rx_desc, skb)) { + if (xdp_res || igc_cleanup_headers(rx_ring, rx_desc, skb)) { skb =3D NULL; continue; } --=20 2.34.1