From nobody Fri Apr 3 05:28:03 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 7F098ECAAA1 for ; Thu, 15 Sep 2022 20:30:07 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229679AbiIOUaF (ORCPT ); Thu, 15 Sep 2022 16:30:05 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49022 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229458AbiIOU37 (ORCPT ); Thu, 15 Sep 2022 16:29:59 -0400 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 63A5D30F5A for ; Thu, 15 Sep 2022 13:29:58 -0700 (PDT) Received: by mail-ej1-x62d.google.com with SMTP id 13so15731325ejn.3 for ; Thu, 15 Sep 2022 13:29:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=v1YzXJ4RvumAwk7bF6dhyR+VAPv7fcA5m5FBuJy0qIY=; b=qPH+EslmJox4jB/AYeCJVyO2sQGqb2P7YW0rUcwI0rqV6lVGQ0zsfxckTccO+35RwJ D54NAIXUhnx7L7+nGaVxxv/YcyCGx7zWRSQX/OQmQEcBb/zUyF/9gMZQnD1kvz9iOf/3 QU7WSvojdZ4m9nGT/BwQC6Ccxci9CIg29PqKNyiwXxKVXkJOrYCS2ulm0PvBVxsqN+1c 7cPXwm05Gr27KWuIEnv4VON0gniO/kzAXrAI3Q95bZyjILHTlvunb/22gFl3YPJ1mrfR uMV2GjSbArOlKqR2BEweVwf76cVk3ig9sQ1CH3tXZv4JnX8gTJMf7xlfdIaG6w7HJa9p lV5A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=v1YzXJ4RvumAwk7bF6dhyR+VAPv7fcA5m5FBuJy0qIY=; b=d5qPa+B9/3gKXXj+Rqs6WAiwHhCbmpHKmjvuOAkoo+ZdM+OOPcZDkehVanHtZ9EZgT bATS09DCkMahetIGisbWtEtuYNUL8ZhGVQEqCNth3FscX8ODSKsrrOfWvx0w6KBfnkFu AMyLbWlQ0AEkCD69FuXGgg7k46nTgq81q4snPXQI8H+y36XAK9OQEdLl/ONN5yiwZ+4Z eS3zpag67hUAAqQNJMYIPLtpRz3D1Zu2nqIcYIiX7+5LRKnuHZ0IIpcrhAMqtEhjx6SV qrACrte4Eq65LvYOjWZx7dBlxMF552JDOaVUl99neq6ZuWFbPNW1ldTxa1rROxMUfX6h c70w== X-Gm-Message-State: ACrzQf3YC/fKXRqCoLuN/KtKRZiycX8Q+JnurVRQ0chEaKa000/FsVDr fdDMyC/eGyUdpYQd71zDamQ= X-Google-Smtp-Source: AMsMyM7mkHT26n8JwF9D9Gn8feUc/Kvkri9ZB0b/ZgqMXdfMsg8jMzESijFS1oWsnlJuXB6RvCrfRA== X-Received: by 2002:a17:906:ee86:b0:741:89bc:27a1 with SMTP id wt6-20020a170906ee8600b0074189bc27a1mr1133421ejb.725.1663273796925; Thu, 15 Sep 2022 13:29:56 -0700 (PDT) Received: from localhost.localdomain (ip-217-105-46-43.ip.prioritytelecom.net. [217.105.46.43]) by smtp.gmail.com with ESMTPSA id ci25-20020a170906c35900b0072b3406e9c2sm9607295ejb.95.2022.09.15.13.29.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Sep 2022 13:29:56 -0700 (PDT) From: Nam Cao To: forest@alittletooquiet.net, gregkh@linuxfoundation.org Cc: namcaov@gmail.com, philipp.g.hortmann@gmail.com, linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev Subject: [RFC PATCH 1/5] staging: vt6655: remove redundant if condition Date: Thu, 15 Sep 2022 22:29:32 +0200 Message-Id: <1e26ece88d2fbf6dafff8694d70a8e52dfb3c077.1663273218.git.namcaov@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The function vnt_receive_frame always returns true, so checking its return value is redundant. Remove it. Signed-off-by: Nam Cao Tested-by: Philipp Hortmann --- drivers/staging/vt6655/device_main.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/= device_main.c index 04d737012cef..79325a693857 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -832,12 +832,12 @@ static int device_rx_srv(struct vnt_private *priv, un= signed int idx) if (!rd->rd_info->skb) break; =20 - if (vnt_receive_frame(priv, rd)) { - if (!device_alloc_rx_buf(priv, rd)) { - dev_err(&priv->pcid->dev, - "can not allocate rx buf\n"); - break; - } + vnt_receive_frame(priv, rd); + + if (!device_alloc_rx_buf(priv, rd)) { + dev_err(&priv->pcid->dev, + "can not allocate rx buf\n"); + break; } rd->rd0.owner =3D OWNED_BY_NIC; } --=20 2.25.1 From nobody Fri Apr 3 05:28:03 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 50467C32771 for ; Thu, 15 Sep 2022 20:30:12 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229579AbiIOUaK (ORCPT ); Thu, 15 Sep 2022 16:30:10 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49054 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229501AbiIOUaA (ORCPT ); Thu, 15 Sep 2022 16:30:00 -0400 Received: from mail-ed1-x529.google.com (mail-ed1-x529.google.com [IPv6:2a00:1450:4864:20::529]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F0A6032B8B for ; Thu, 15 Sep 2022 13:29:58 -0700 (PDT) Received: by mail-ed1-x529.google.com with SMTP id z97so28655514ede.8 for ; Thu, 15 Sep 2022 13:29:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=OipeXrKVU1BCY0WjlS+Kuojt9dLqNbUbahDVdYj30x8=; b=mkQTbaiVCfxFHMGkSMiDq2B0j4wI7cUA65gFgr12puDxoaN1ZTeoAReUDGZxV3OA2B wWG5GBIXcY6Ttqkbc1iAXFWCe+cXNzdIXshyYk8OoR5lQgPFf4dv0JgbXjd745cRWP14 gneqlmF4Msg58rqdMeOpMwiLdm1dHZJh62MPz5/4M89qZ4wJpb6PY8a0SpWIXBYjDkVY VdQciox2/UEeeUNiHuB1rPf6/enpOKq562MUva6huD8LZHV1dBuAJihQUR8UqmTcaU/p sAJ0/ri8wddyl/NJ/Ow7GSMHz2EZ6HYkIEoFny0++WFY0g6oMP6KTmF6q1TGuphJKAv8 U+Jg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=OipeXrKVU1BCY0WjlS+Kuojt9dLqNbUbahDVdYj30x8=; b=C+KAFfcpNHrJlJ1neWjl6hMMQIdd4eOGpLEjS73QD04OouUG8kBUhU7FgPq4gDZUQi Ls0G6fojvWVeDB47iO8GB5EYGqTErgoulcT+2rLoAmnGZMpFjKU25G7RMJmzTY8VMdQs MMqr5W4Uqf6ZngDpiD8uJoKG82U1wo+rlmd3bhFftox9AzABqM9aJfFYz1ujahRaAMBK PUF9dQHuGwkNdgj7g+YBrq7scTIdfNrvAdXw1lA2ip/BQyKfGaUS8NLw1MFgUx4YKDsy tffw+Ihsk8QhkML073rYyghwY3rUVb2Vi0PKN2I3xjMkcOfdGi+ifDNkhAWMQlRCtcut E+kA== X-Gm-Message-State: ACrzQf26t2vp9VrjHqQEKBJvUFT4waQVcdiwlNH+vU7j9T1dqw6AIOjW f5fuvyaimZyXKdNhmNU3vNM= X-Google-Smtp-Source: AMsMyM4jFu/KytAdYQKVUma6k3L7U3Vgc2mj0hUp08Ns2veNAewKttBuNZLs9d1DH1nAwCBbGSxb9g== X-Received: by 2002:a05:6402:50d1:b0:452:899e:77c with SMTP id h17-20020a05640250d100b00452899e077cmr1348375edb.0.1663273797603; Thu, 15 Sep 2022 13:29:57 -0700 (PDT) Received: from localhost.localdomain (ip-217-105-46-43.ip.prioritytelecom.net. [217.105.46.43]) by smtp.gmail.com with ESMTPSA id ci25-20020a170906c35900b0072b3406e9c2sm9607295ejb.95.2022.09.15.13.29.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Sep 2022 13:29:57 -0700 (PDT) From: Nam Cao To: forest@alittletooquiet.net, gregkh@linuxfoundation.org Cc: namcaov@gmail.com, philipp.g.hortmann@gmail.com, linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev Subject: [RFC PATCH 2/5] staging: vt6655: change vnt_receive_frame return type to void Date: Thu, 15 Sep 2022 22:29:33 +0200 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The function vnt_receive_frame's returned value is not used anywhere. Furthermore, it always return true. Change its return type to void. Signed-off-by: Nam Cao Tested-by: Philipp Hortmann --- drivers/staging/vt6655/dpc.c | 8 ++++---- drivers/staging/vt6655/dpc.h | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/staging/vt6655/dpc.c b/drivers/staging/vt6655/dpc.c index c6ed3537f439..9f2128f5d3c3 100644 --- a/drivers/staging/vt6655/dpc.c +++ b/drivers/staging/vt6655/dpc.c @@ -115,7 +115,7 @@ static bool vnt_rx_data(struct vnt_private *priv, struc= t sk_buff *skb, return true; } =20 -bool vnt_receive_frame(struct vnt_private *priv, struct vnt_rx_desc *curr_= rd) +void vnt_receive_frame(struct vnt_private *priv, struct vnt_rx_desc *curr_= rd) { struct vnt_rd_info *rd_info =3D curr_rd->rd_info; struct sk_buff *skb; @@ -133,13 +133,13 @@ bool vnt_receive_frame(struct vnt_private *priv, stru= ct vnt_rx_desc *curr_rd) /* Frame Size error drop this packet.*/ dev_dbg(&priv->pcid->dev, "Wrong frame size %d\n", frame_size); dev_kfree_skb_irq(skb); - return true; + return; } =20 if (vnt_rx_data(priv, skb, frame_size)) - return true; + return; =20 dev_kfree_skb_irq(skb); =20 - return true; + return; } diff --git a/drivers/staging/vt6655/dpc.h b/drivers/staging/vt6655/dpc.h index 40364c0ab7f6..f67c1ef23171 100644 --- a/drivers/staging/vt6655/dpc.h +++ b/drivers/staging/vt6655/dpc.h @@ -16,6 +16,6 @@ =20 #include "device.h" =20 -bool vnt_receive_frame(struct vnt_private *priv, struct vnt_rx_desc *curr_= rd); +void vnt_receive_frame(struct vnt_private *priv, struct vnt_rx_desc *curr_= rd); =20 #endif /* __RXTX_H__ */ --=20 2.25.1 From nobody Fri Apr 3 05:28:03 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63008ECAAA1 for ; Thu, 15 Sep 2022 20:30:26 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229697AbiIOUaY (ORCPT ); Thu, 15 Sep 2022 16:30:24 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49110 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229588AbiIOUaC (ORCPT ); Thu, 15 Sep 2022 16:30:02 -0400 Received: from mail-ed1-x52d.google.com (mail-ed1-x52d.google.com [IPv6:2a00:1450:4864:20::52d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id CFCB936854 for ; Thu, 15 Sep 2022 13:29:59 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id y8so21745307edc.10 for ; Thu, 15 Sep 2022 13:29:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=y9AZ5yPTroiJBvhJDLo/B5BMwojZlFfEWtDm17F1H2o=; b=gKcrXG508Y7GGiISvf6xps0gJw1MiLbJWci8tBoN0NFKZiy8RXXR15fxug2/MvscW/ aays0JHzdQ3vwG2L1+KMSarkqy+WhO8hMV9HNU2XtTkIPszTtrXid4LObO7uJhdW2A83 tseJQ6jPcvB6F9cqpLy1UFYF337eBlQ4DcatUaoSKBjs3kIxsMv2OWxQq5nUvkp+/gkW YMm1xFQFFRbcgbi/VRHqYA2FQh0DS+CWl07E+8JlaN94wi9IEa+6ctV7Yq+m1PgKrG+p SHkoRG9wvsJvpTBONXQ68u8bvDEDtOQrKu91c642tK1GpDz1OkXsLkvbx1+ikGKFEuvc ZiDw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=y9AZ5yPTroiJBvhJDLo/B5BMwojZlFfEWtDm17F1H2o=; b=4TKpChdlNVno0lvSyPrQZChtUq/NMiJVNZZipEmgxr/CD2GzEUiyFH3U6JYquzP4UK c7AtXp9zUVC3p8OJuoiO/D0HLYIeeJeYzF82f+64+WsEDQ5aL6kZ+oZwD9kNxXwqfeer NLzfKJCUhcPuc5Vc+krp/qxdWF8HItm6L5SCTgBGavsxIvDZoFsGeEah/XbNkG4kSOqv 3qRrVZYHH5Pyl4AVxpD+ZmSA4fHu/J4xHl4Upa+choSEQIJ/PFOIfCsPVkXF4U7AdQ8C GhsjIGSmSyan4L5YISlk0NKyN0y13DHSPL018QKQDZdFBpQm1WinGsCvkYbfPd3Ihpvb cBAA== X-Gm-Message-State: ACrzQf08HloSKnPTrTnKTW9qQLd/nv4+0RzhSKsxJI78K3pivY1a7s9l WGfKilZVRvWMM5VHctzg6J+s8xs62P8= X-Google-Smtp-Source: AMsMyM7JmiuWn67fftEFKkqPS8BNP2/xzQh97SQlBr9HtoIthWNMA3iryF30oADtYmNKay/PmC0nfA== X-Received: by 2002:a05:6402:28ca:b0:43b:5235:f325 with SMTP id ef10-20020a05640228ca00b0043b5235f325mr1323816edb.320.1663273798405; Thu, 15 Sep 2022 13:29:58 -0700 (PDT) Received: from localhost.localdomain (ip-217-105-46-43.ip.prioritytelecom.net. [217.105.46.43]) by smtp.gmail.com with ESMTPSA id ci25-20020a170906c35900b0072b3406e9c2sm9607295ejb.95.2022.09.15.13.29.57 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Sep 2022 13:29:58 -0700 (PDT) From: Nam Cao To: forest@alittletooquiet.net, gregkh@linuxfoundation.org Cc: namcaov@gmail.com, philipp.g.hortmann@gmail.com, linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev Subject: [RFC PATCH 3/5] staging: vt6655: split device_alloc_rx_buf Date: Thu, 15 Sep 2022 22:29:34 +0200 Message-Id: <311eaa7dabe12d0baeb0af6f85c2b43b20b230a3.1663273218.git.namcaov@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The function device_alloc_rx_buf does 2 things: allocating rx buffer and initializing the rx descriptor's values. Split this function into two, with each does one job. This split is preparation for implementing correct out-of-memory error handling. Signed-off-by: Nam Cao Tested-by: Philipp Hortmann --- drivers/staging/vt6655/device_main.c | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/= device_main.c index 79325a693857..27fe28156257 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -133,6 +133,7 @@ static int device_init_td1_ring(struct vnt_private *pri= v); static int device_rx_srv(struct vnt_private *priv, unsigned int idx); static int device_tx_srv(struct vnt_private *priv, unsigned int idx); static bool device_alloc_rx_buf(struct vnt_private *, struct vnt_rx_desc *= ); +static void device_init_rx_desc(struct vnt_private *priv, struct vnt_rx_de= sc *rd); static void device_free_rx_buf(struct vnt_private *priv, struct vnt_rx_desc *rd); static void device_init_registers(struct vnt_private *priv); @@ -615,6 +616,8 @@ static int device_init_rd0_ring(struct vnt_private *pri= v) dev_err(&priv->pcid->dev, "can not alloc rx bufs\n"); ret =3D -ENOMEM; goto err_free_rd; + } else { + device_init_rx_desc(priv, desc); } =20 desc->next =3D &priv->aRD0Ring[(i + 1) % priv->opts.rx_descs0]; @@ -661,6 +664,8 @@ static int device_init_rd1_ring(struct vnt_private *pri= v) dev_err(&priv->pcid->dev, "can not alloc rx bufs\n"); ret =3D -ENOMEM; goto err_free_rd; + } else { + device_init_rx_desc(priv, desc); } =20 desc->next =3D &priv->aRD1Ring[(i + 1) % priv->opts.rx_descs1]; @@ -838,7 +843,10 @@ static int device_rx_srv(struct vnt_private *priv, uns= igned int idx) dev_err(&priv->pcid->dev, "can not allocate rx buf\n"); break; + } else { + device_init_rx_desc(priv, rd); } + rd->rd0.owner =3D OWNED_BY_NIC; } =20 @@ -865,15 +873,17 @@ static bool device_alloc_rx_buf(struct vnt_private *p= riv, rd_info->skb =3D NULL; return false; } + return true; +} =20 +static void device_init_rx_desc(struct vnt_private *priv, struct vnt_rx_de= sc *rd) +{ *((unsigned int *)&rd->rd0) =3D 0; /* FIX cast */ =20 rd->rd0.res_count =3D cpu_to_le16(priv->rx_buf_sz); rd->rd0.owner =3D OWNED_BY_NIC; rd->rd1.req_count =3D cpu_to_le16(priv->rx_buf_sz); - rd->buff_addr =3D cpu_to_le32(rd_info->skb_dma); - - return true; + rd->buff_addr =3D cpu_to_le32(rd->rd_info->skb_dma); } =20 static void device_free_rx_buf(struct vnt_private *priv, --=20 2.25.1 From nobody Fri Apr 3 05:28:03 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 44ECBC32771 for ; Thu, 15 Sep 2022 20:30:19 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229704AbiIOUaQ (ORCPT ); Thu, 15 Sep 2022 16:30:16 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49112 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229615AbiIOUaC (ORCPT ); Thu, 15 Sep 2022 16:30:02 -0400 Received: from mail-ej1-x631.google.com (mail-ej1-x631.google.com [IPv6:2a00:1450:4864:20::631]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 758BB3A160 for ; Thu, 15 Sep 2022 13:30:00 -0700 (PDT) Received: by mail-ej1-x631.google.com with SMTP id dv25so44658743ejb.12 for ; Thu, 15 Sep 2022 13:30:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=Z8Qqwdo2MtVcZqXTy6aDXip/9KzF6Sq0fneVcEjjyRo=; b=L8Pucizs8ljkp8vk9wz/6AX3QAnAzERGaTZXN5Xtzt+Oksh3TboL9cp4Vdco/JnJ9m LlbMhu9CG4cmzLfCsNDj8OrF9eNx38/9YfccvNpA1nePgGyYrOdvAHXy4FrEMgki96ys fx70mupblp/elgVIYQmkTn80xwdSw1AUWalxe2CZV3+4YbLvoCEl2I41smd5f7ep1Als UNGlaP4Frt60oAyqTO8YZx1dxXIKKHfK9snJwxlEaMWUxQUNPYrj5JRKkZ60imoybskD GF1Z7u47PKSJJZ0ZcOonx7myW1AWh/89bwaPa4SJJ7Eg3vO+fQwaALIDh4epEm8+mYNd aBlA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=Z8Qqwdo2MtVcZqXTy6aDXip/9KzF6Sq0fneVcEjjyRo=; b=afCkgsMy8dz8ECoIr2n1lPXybh6GKH2YTgAie8SW+4u3llJZ/rjseUqVRD0J7p8nsu 6ZypsrnloTkVfNNuBNVBWxhRfT0Sd9symoZEMbLoGunpclQxs4Ygs4V655boq8FIO9We k170ZExZGL72oTC9K6Os2dBLvn+9ae6w0FN0NjI4HiD9nrjS8VBWVdLIsMn4LyrmBshI PkpdJRshmDaKnm9OpEzZsnYzRp+FkmdEwTs/TAd5gWrgiWgLaGWAhKal06n/YMoZaIwl PKMS6n3kgDj5Ov/xoLGLSGFTdSjyOPcMkkYzIVU4oLv4+Qdn1gyw/z8HpCb9Jp2eeWac fdJA== X-Gm-Message-State: ACrzQf3rDaMBpjfzOvVXzNQ1Tdyy0Q74ogNLXeNP3X888x+UxFo9iPUQ 6ENE/X5QbiuZBaZ5NnnQM1s= X-Google-Smtp-Source: AMsMyM7V0C4G80Zc+gWypxx7ogIGlXVCzN3I+LiRymGBanw+Tl/rnn6iqK8FtO+uaoYijBl7RYVOFA== X-Received: by 2002:a17:907:320c:b0:77b:6f08:9870 with SMTP id xg12-20020a170907320c00b0077b6f089870mr1108419ejb.249.1663273799106; Thu, 15 Sep 2022 13:29:59 -0700 (PDT) Received: from localhost.localdomain (ip-217-105-46-43.ip.prioritytelecom.net. [217.105.46.43]) by smtp.gmail.com with ESMTPSA id ci25-20020a170906c35900b0072b3406e9c2sm9607295ejb.95.2022.09.15.13.29.58 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Sep 2022 13:29:58 -0700 (PDT) From: Nam Cao To: forest@alittletooquiet.net, gregkh@linuxfoundation.org Cc: namcaov@gmail.com, philipp.g.hortmann@gmail.com, linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev Subject: [RFC PATCH 4/5] staging: vt6655: change device_alloc_rx_buf's argument Date: Thu, 15 Sep 2022 22:29:35 +0200 Message-Id: <40d72f6fdc3394a0bba15753d4f3b103bbc8332e.1663273218.git.namcaov@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The function device_alloc_rx_buf takes struct vnt_rx_desc as 1 argument, but only accesses the member rd_info of this struct. Change this argument to struct vnt_rd_info instead. This is preparation to implement correct out-of-memory error handling. Signed-off-by: Nam Cao Tested-by: Philipp Hortmann --- drivers/staging/vt6655/device_main.c | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/= device_main.c index 27fe28156257..ca6c4266f010 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -132,7 +132,7 @@ static int device_init_td1_ring(struct vnt_private *pri= v); =20 static int device_rx_srv(struct vnt_private *priv, unsigned int idx); static int device_tx_srv(struct vnt_private *priv, unsigned int idx); -static bool device_alloc_rx_buf(struct vnt_private *, struct vnt_rx_desc *= ); +static bool device_alloc_rx_buf(struct vnt_private *, struct vnt_rd_info *= ); static void device_init_rx_desc(struct vnt_private *priv, struct vnt_rx_de= sc *rd); static void device_free_rx_buf(struct vnt_private *priv, struct vnt_rx_desc *rd); @@ -612,7 +612,7 @@ static int device_init_rd0_ring(struct vnt_private *pri= v) goto err_free_desc; } =20 - if (!device_alloc_rx_buf(priv, desc)) { + if (!device_alloc_rx_buf(priv, desc->rd_info)) { dev_err(&priv->pcid->dev, "can not alloc rx bufs\n"); ret =3D -ENOMEM; goto err_free_rd; @@ -660,7 +660,7 @@ static int device_init_rd1_ring(struct vnt_private *pri= v) goto err_free_desc; } =20 - if (!device_alloc_rx_buf(priv, desc)) { + if (!device_alloc_rx_buf(priv, desc->rd_info)) { dev_err(&priv->pcid->dev, "can not alloc rx bufs\n"); ret =3D -ENOMEM; goto err_free_rd; @@ -839,7 +839,7 @@ static int device_rx_srv(struct vnt_private *priv, unsi= gned int idx) =20 vnt_receive_frame(priv, rd); =20 - if (!device_alloc_rx_buf(priv, rd)) { + if (!device_alloc_rx_buf(priv, rd->rd_info)) { dev_err(&priv->pcid->dev, "can not allocate rx buf\n"); break; @@ -856,10 +856,8 @@ static int device_rx_srv(struct vnt_private *priv, uns= igned int idx) } =20 static bool device_alloc_rx_buf(struct vnt_private *priv, - struct vnt_rx_desc *rd) + struct vnt_rd_info *rd_info) { - struct vnt_rd_info *rd_info =3D rd->rd_info; - rd_info->skb =3D dev_alloc_skb((int)priv->rx_buf_sz); if (!rd_info->skb) return false; --=20 2.25.1 From nobody Fri Apr 3 05:28:03 2026 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4D99FC32771 for ; Thu, 15 Sep 2022 20:30:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229685AbiIOUa2 (ORCPT ); Thu, 15 Sep 2022 16:30:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49304 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229642AbiIOUaE (ORCPT ); Thu, 15 Sep 2022 16:30:04 -0400 Received: from mail-ej1-x62d.google.com (mail-ej1-x62d.google.com [IPv6:2a00:1450:4864:20::62d]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5B0D03ED53 for ; Thu, 15 Sep 2022 13:30:01 -0700 (PDT) Received: by mail-ej1-x62d.google.com with SMTP id bj12so44644486ejb.13 for ; Thu, 15 Sep 2022 13:30:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date; bh=EUHm5YwqUsut8vOCDG8gUqHimnptxihIuTZPupLKd+w=; b=oIsRIL7UHb5uy1H8a7ihPHy/irgQmUeLrHpYfS62aKWb2o/bCxHIE9WPyF8VzZdomb wZ5KoUxZNkcXT2QeXaqZKZ+UJlRUPHNxXRHIwzInSaLL0KI3q/mb7mF8Z5wRRiuV5eUD D7FCoOdc8jROfJuLlV5uA+KgtIKNXa/dn5oYXNR8k1XsXq/ZYW4ZQ1YluyGJgVUU6ZJ3 po+mLGWVk5f2/6hZPL5pt9a2MpaMx7E9cm6+2gapZfsFfEN8NF0cPQlq9zb2Mqgrbfry nhajo4cRNX5XDG196iI3bxK/LIyKBJXZobuOuf2jd+wYuWih9l+HDqxOwQmD3VE7Dub4 7Dcg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date; bh=EUHm5YwqUsut8vOCDG8gUqHimnptxihIuTZPupLKd+w=; b=d0Mmz3bqOiRhgAwRd+KprQtvOMiVovbQgPQCBhpvH7KHzMZZZBC+UepB4weZm0XYsh 0wE6cBQkuBUGNj5W0EtkgrYbyFgd3b2wxVbWlqpZO5NkRrVNjMfF2UB4E0UTei+2FY7y I6n0YuI3Be9fgY3kpC3ErS3old1kHc1Yyv7dnWk9BaDNZlc/r88P8UGR+ssgwYPPMJeH jI+DxRqj4S/I7tknw3XDTzt4rc3Is3PEd4GFxbmH/Hda+UuWaXMHha5ftEEKO87bbgsl zMuU35cAnYfKKp4nHqmPfrutagX/I5NikxeKKh8udIMKoY3FvRLSCLbZhQIg9lj3T3JT xKmA== X-Gm-Message-State: ACrzQf2zAJd/D4ZhlaAnIs4TCGTOGtoq8sbtLDOZuQ9nui9cbRkbFB8B /ijSrNj6+/vJ+ZMYU859mn0= X-Google-Smtp-Source: AMsMyM6s9925GGiS4XIQLJDs2LHEhvI9/OQ12/6LogfvtbqAUEhF5PB9+dgHAJ5gZamzhCHPYFc0tA== X-Received: by 2002:a17:906:ef90:b0:77c:7227:705 with SMTP id ze16-20020a170906ef9000b0077c72270705mr1117401ejb.565.1663273799789; Thu, 15 Sep 2022 13:29:59 -0700 (PDT) Received: from localhost.localdomain (ip-217-105-46-43.ip.prioritytelecom.net. [217.105.46.43]) by smtp.gmail.com with ESMTPSA id ci25-20020a170906c35900b0072b3406e9c2sm9607295ejb.95.2022.09.15.13.29.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 15 Sep 2022 13:29:59 -0700 (PDT) From: Nam Cao To: forest@alittletooquiet.net, gregkh@linuxfoundation.org Cc: namcaov@gmail.com, philipp.g.hortmann@gmail.com, linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev Subject: [RFC PATCH 5/5] staging: vt6655: implement allocation failure handling Date: Thu, 15 Sep 2022 22:29:36 +0200 Message-Id: X-Mailer: git-send-email 2.25.1 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" The function device_rx_srv does not handle allocation failure very well. Currently, it performs these steps: - Unmap DMA buffer and hand over the buffer to mac80211 - Allocate and dma-map new buffer - If allocation fails, abort The problem is that, it aborts while still marking the buffer as OWNED_BY_HOST. So when this function is called again in the future, it incorrectly perceives the same buffer as valid and dma-unmap and hand over this buffer to mac80211 again. Re-implement this function to do things in a different order: - Allocate and dma-map new buffer - If allocation fails, abort and give up the ownership of the buffer (so that the device can re-use this buffer) - If allocation does not fail: unmap dma buffer and hand over the buffer to mac80211 Thus, when the driver cannot allocate new buffer, it simply discards the received data and re-use the current buffer. Signed-off-by: Nam Cao Tested-by: Philipp Hortmann --- drivers/staging/vt6655/device_main.c | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/= device_main.c index ca6c4266f010..8ae4ecca2ee3 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -826,6 +826,7 @@ static void device_free_td1_ring(struct vnt_private *pr= iv) static int device_rx_srv(struct vnt_private *priv, unsigned int idx) { struct vnt_rx_desc *rd; + struct vnt_rd_info new_info; int works =3D 0; =20 for (rd =3D priv->pCurrRD[idx]; @@ -837,16 +838,18 @@ static int device_rx_srv(struct vnt_private *priv, un= signed int idx) if (!rd->rd_info->skb) break; =20 - vnt_receive_frame(priv, rd); - - if (!device_alloc_rx_buf(priv, rd->rd_info)) { + if (!device_alloc_rx_buf(priv, &new_info)) { dev_err(&priv->pcid->dev, "can not allocate rx buf\n"); + rd->rd0.owner =3D OWNED_BY_NIC; break; - } else { - device_init_rx_desc(priv, rd); } =20 + vnt_receive_frame(priv, rd); + + memcpy(rd->rd_info, &new_info, sizeof(new_info)); + device_init_rx_desc(priv, rd); + rd->rd0.owner =3D OWNED_BY_NIC; } =20 --=20 2.25.1