From nobody Tue May 7 06:02:44 2024 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 29BD9C54EE9 for ; Wed, 28 Sep 2022 17:23:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234510AbiI1RXg (ORCPT ); Wed, 28 Sep 2022 13:23:36 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59078 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234278AbiI1RX1 (ORCPT ); Wed, 28 Sep 2022 13:23:27 -0400 Received: from mail-ed1-x531.google.com (mail-ed1-x531.google.com [IPv6:2a00:1450:4864:20::531]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 151AF7FE60 for ; Wed, 28 Sep 2022 10:23:25 -0700 (PDT) Received: by mail-ed1-x531.google.com with SMTP id z2so18202730edi.1 for ; Wed, 28 Sep 2022 10:23:25 -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=bAT4lI1cS6DeEw/8Q0cGUzgW7gwK5qXIMg6NrWzIWKo=; b=fEIfyz2lCaTo35Ue4OkF0Ce0XXDTMNKrW9uOD2H5Cn97v72XOAopWJnlWZxkrScF7d D1gfVWLXpX6mprk0QT7U0Y9ZfP2P5byBEQ32LQRkZYf/qDtSm4Rhhv50+gR8f68Yloue P6OJd3Ta24r6AREVrl6pKVKk8CfOvABnFByko0wbNtZgIg9EPm/Mr0pjBGWuL9QWoQfD r8sKcyhekFWOmI7Bag7qyThRdjrTXB7UhB97qCMr33ZoMFkw7rvZs3DxEGeWu9urmlJa JFMLNtGxIfqACdW/SXFNGNc5O6uVRS2m8mQJ/mePChfQ48grsZVQUTckhOhIxV9bHmxx UsAw== 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=bAT4lI1cS6DeEw/8Q0cGUzgW7gwK5qXIMg6NrWzIWKo=; b=6naIbD4rIxaJACkjzPTXryUX5GkmllbuHq5lhwzUl0uCsUZ2SRlD/JFantSpEgcBMQ qcs4Xl9twBzN9/hWpU7yUhzJYEvc/2KptA4xSsn6SxIcjlDQyHvdt4cmrlm/albW4NNn mfXOo7qxLyTI+1O3M4qNGhW3A2NoKSp9IIdvDnX8isJw415rugfDs4q3u5du2HMQ711N uG4SMTjupZsrEyBuo1NSZlVr56W/qGvwQ8lcF/VdX+BfXA6REkGz9VI38ss2KO4PnvVp UdpdYJ0oD0ZgDsEIhihajZ8k5cM+NmbiDnhbKT3TYmeOVaVEraBrBzIs6XSWIpYb2k/E /WjQ== X-Gm-Message-State: ACrzQf1pqakT4Zp6SvSQ02QEALZNGushAH/cKFIOL27raWLOWPYTTSrW vmcpXcKd3uyM3TTKxf1zW6I= X-Google-Smtp-Source: AMsMyM7VZsEXH6/txaWqMLlbcIlXV7P46ZdA8KCN1Hlp0FtfoZLURwXphOhPimW+QJ1dy03zkv77nQ== X-Received: by 2002:a05:6402:2694:b0:450:d537:f6d6 with SMTP id w20-20020a056402269400b00450d537f6d6mr35433802edd.344.1664385804315; Wed, 28 Sep 2022 10:23:24 -0700 (PDT) Received: from localhost.localdomain (ip-217-105-46-158.ip.prioritytelecom.net. [217.105.46.158]) by smtp.gmail.com with ESMTPSA id lb6-20020a170907784600b007306a4ecc9dsm2725063ejc.18.2022.09.28.10.23.23 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Sep 2022 10:23:24 -0700 (PDT) From: Nam Cao To: forest@alittletooquiet.net, gregkh@linuxfoundation.org, dan.carpenter@oracle.com Cc: namcaov@gmail.com, philipp.g.hortmann@gmail.com, linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev Subject: [RFC PATCH v2 1/4] staging: vt6655: remove redundant if condition Date: Wed, 28 Sep 2022 19:21:47 +0200 Message-Id: <6a4028a10308d3abcd31421a28e760fc3ca61a72.1664384503.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 56c3cf3ba53d..21d10d9fde47 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 Tue May 7 06:02:44 2024 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 E44A3C04A95 for ; Wed, 28 Sep 2022 17:23:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234295AbiI1RXa (ORCPT ); Wed, 28 Sep 2022 13:23:30 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59048 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234222AbiI1RX0 (ORCPT ); Wed, 28 Sep 2022 13:23:26 -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 6F5FA7EFF6 for ; Wed, 28 Sep 2022 10:23:25 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id x92so5018566ede.9 for ; Wed, 28 Sep 2022 10:23:25 -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=eetEjuSkhalPLHiWeGxus8bROhu0lZ19os/TvMTlIMk=; b=ICUhpvuZDb1P0hySZ0jMjdsGrelSzCxJz6y7FWYeAw3HkgJRjYOrdoWYTwfYpsBVdU CbTu59RWHtYEtAwdbxNRvAJxymLYM/h/1qUuuRuIqy9jPYwPb7jyP23mwSUspqHpJTH5 KCkD7IwOJ4bYZmQzxuAa8ZXCgM8R9/dAL/KoKxu+576xrB6lEM2gpMvEJym2jZH8ABD1 WftJv3Vm0H4ezxR7ov49EJrkpAVKa8In4JyJXwaym7DNBeoK9MG+mqZdgs64ljRDXssy EFhxleX5U40/JoufCLmO33rqIIXZQzTgAbQOUM/ac0qSCrb+2CJ3vYNUiNZLDEbiljxm 6TdA== 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=eetEjuSkhalPLHiWeGxus8bROhu0lZ19os/TvMTlIMk=; b=jHNsuWWsgKuVFZ41aZrgjrRgvXkLt5XvJWuW0TdIYIMDfMWpNudRwNC2TMjyM4T4qo TNtNKf7BVSyn5SG6yHvlyXQpakE9tTvcJxYr0xCPI/0Mw3Mw1BUa3lrBQGJ//BgewNlP QDoRdrHJa/9rvR38/RUoNBdP2uf1rb/hEhO+vDM2n0pvZb+FFLIOnw5S8ubljJeZoUzR V+sq8dOVh6Vr8rzr0bTBIUhOSH936CFPLgpW17IQo8Bo7bR3O/0OEoUXtSvwVsuswtkc RDoQTqGlU+jfUR7ZuikwK+476Uz4skGP/pMnYpsh4ECyXzHZqpUQ9Iwat0pnb+XzPeZ9 W3sw== X-Gm-Message-State: ACrzQf14MxFGapGS1R9tKbL1a157gJsHPSSp6YtE0h1hTVsklf3obCWj vKEfdNyUUS+GvdIxzSqGWbI= X-Google-Smtp-Source: AMsMyM4wxvJ3D8J5tE4tZn09em8hcwFLdyJED6h2K7abaMEOO7BP9RQwxEq78YUqvIeY1fgC3s7vIw== X-Received: by 2002:a05:6402:559:b0:457:d9fc:6870 with SMTP id i25-20020a056402055900b00457d9fc6870mr6149450edx.183.1664385805041; Wed, 28 Sep 2022 10:23:25 -0700 (PDT) Received: from localhost.localdomain (ip-217-105-46-158.ip.prioritytelecom.net. [217.105.46.158]) by smtp.gmail.com with ESMTPSA id lb6-20020a170907784600b007306a4ecc9dsm2725063ejc.18.2022.09.28.10.23.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Sep 2022 10:23:24 -0700 (PDT) From: Nam Cao To: forest@alittletooquiet.net, gregkh@linuxfoundation.org, dan.carpenter@oracle.com Cc: namcaov@gmail.com, philipp.g.hortmann@gmail.com, linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev Subject: [RFC PATCH v2 2/4] staging: vt6655: change vnt_receive_frame return type to void Date: Wed, 28 Sep 2022 19:21:48 +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, 4 insertions(+), 6 deletions(-) diff --git a/drivers/staging/vt6655/dpc.c b/drivers/staging/vt6655/dpc.c index c6ed3537f439..3bf60039fa9a 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,11 @@ 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); - - return true; } 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 Tue May 7 06:02:44 2024 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 36917C32771 for ; Wed, 28 Sep 2022 17:25:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234617AbiI1RXi (ORCPT ); Wed, 28 Sep 2022 13:23:38 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59092 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234185AbiI1RX2 (ORCPT ); Wed, 28 Sep 2022 13:23:28 -0400 Received: from mail-ej1-x632.google.com (mail-ej1-x632.google.com [IPv6:2a00:1450:4864:20::632]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B24267C1E8 for ; Wed, 28 Sep 2022 10:23:27 -0700 (PDT) Received: by mail-ej1-x632.google.com with SMTP id sd10so28619719ejc.2 for ; Wed, 28 Sep 2022 10:23:27 -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=j1KSyzaOPwalWf0pjnfJfXhH4MRcgiZbBjdZrYO0OQk=; b=Q7jDtpRe5K8YAjFqF4bQRDvmoFtZVKows8Ctd0gk4DNtFLOvt/NfdMOjgSAJwaERsG a36RbywejyXu0Q3iabHXMXwunSrULrBSrEzXZmRma0Y0/9dGbErngxzCm1BByz7XdP8e 0hQK+k/TB9BZfB72vQ9QiicJuFkSJ6Bgbfx+xEwBwlFRCk/xpYorF3lE7yk12bu0Rbjf p/fu421y8+GmU8gKV5gFSRIylrfvm1jccDN6vO5GD8xCWO0l4UjaDhUgr6y/cl0xEheF 2GY1oiDVF6QirQHO9DrEZ3B0xC3ygjyXS9jxk2gpizu76K00BPZKrLC01/nkvHtejppU sEPA== 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=j1KSyzaOPwalWf0pjnfJfXhH4MRcgiZbBjdZrYO0OQk=; b=E7KcHGYZQw4HPpYj5mYWfMFew5m2/JGVsqwlMt00Y4W4K3VzNwlaFUTpfiMCpOAJLd sdFTTZ841wOJgykfy1pYYFrSyFyUiAKCT83gVlVIm2Zgj/xOzACL3bzdZZ2gtEwtyDo0 iiL8Iqf6OVYdlWf3OSU27NemBldvIRCl6mvaKx4wnQCRa6NWJ9pb+YIiVOWgTb5GdjSg 6MB6AqXr7NnBisEPWxS2GYMSI6AIUS96crEKNjuyLwRVFin3bVE21nCciFwlrc8GkJTl pvzb/l8AqM5OuyXIW8CdbNLKVaqcACQPpMnMxKRuhjVETKFs4FlRzCrP+3PvdWxuo0tX HYFA== X-Gm-Message-State: ACrzQf35QXPH1pQ+SiwKSfcZzU/M5vOpFoTb7FvpD/FKtZzYqlY5kHBb t4rwmYHFlsbDq0ifqmMLGI+VSZlEkic= X-Google-Smtp-Source: AMsMyM6eFw13xXqIKeSV3vLMuLiiD5CfNcuLpmycgL+iEvvH4STqJ+ZsiUXCl3mXQ7m+Mfvk1nnzeA== X-Received: by 2002:a17:906:fe49:b0:73d:70c5:1a52 with SMTP id wz9-20020a170906fe4900b0073d70c51a52mr29369840ejb.469.1664385806018; Wed, 28 Sep 2022 10:23:26 -0700 (PDT) Received: from localhost.localdomain (ip-217-105-46-158.ip.prioritytelecom.net. [217.105.46.158]) by smtp.gmail.com with ESMTPSA id lb6-20020a170907784600b007306a4ecc9dsm2725063ejc.18.2022.09.28.10.23.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Sep 2022 10:23:25 -0700 (PDT) From: Nam Cao To: forest@alittletooquiet.net, gregkh@linuxfoundation.org, dan.carpenter@oracle.com Cc: namcaov@gmail.com, philipp.g.hortmann@gmail.com, linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev Subject: [RFC PATCH v2 3/4] staging: vt6655: remove redundant assignment Date: Wed, 28 Sep 2022 19:21:49 +0200 Message-Id: <4ccc5c55d136cb0749cf773e673fa903eebf473c.1664384503.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" In function device_rx_srv, the assignment rd->rd0.owner =3D OWNED_BY_NIC is redundant because this is already done in device_alloc_rx_buf() which is called right above. Remove it. Signed-off-by: Nam Cao Tested-by: Philipp Hortmann --- drivers/staging/vt6655/device_main.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/= device_main.c index 21d10d9fde47..c8cae6df7f51 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -839,7 +839,6 @@ static int device_rx_srv(struct vnt_private *priv, unsi= gned int idx) "can not allocate rx buf\n"); break; } - rd->rd0.owner =3D OWNED_BY_NIC; } =20 priv->pCurrRD[idx] =3D rd; --=20 2.25.1 From nobody Tue May 7 06:02:44 2024 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 C08E6C32771 for ; Wed, 28 Sep 2022 17:23:49 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234048AbiI1RXr (ORCPT ); Wed, 28 Sep 2022 13:23:47 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:59112 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234399AbiI1RX3 (ORCPT ); Wed, 28 Sep 2022 13:23:29 -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 53BFE7FE60 for ; Wed, 28 Sep 2022 10:23:28 -0700 (PDT) Received: by mail-ed1-x52d.google.com with SMTP id a41so18175012edf.4 for ; Wed, 28 Sep 2022 10:23:28 -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=nkSl1inMpvuvkN+Ej6lt7wMWY0ME+Ef7HkKqG5h0+Mo=; b=lSEubK26SLZ+QN4euhY+WZeOrkrou9JiVJYISGUO1dJWdirN+F0jbn01spSxQ2GwD2 8d6cuNEZosm43QxgXg09MmKgp4BtVmlxKV+oxhWiHI6pyCGWDXVc3NPnSiQDXp7+pBiz 9UeksiOxMmXZ60+2SW6Vi290gtZsk6MY3QOKNNSdDr/vmFAo0Jas7zcI7lRdCNtsRi/o 6OI5Ba0SfqXWlprelKiHWWEpU4xZs5T4BUwQgmYla8oHWdcXdlm5QF7Yk73THqZD4cxy 0Ag09t7MdciHkbO6Pxt0/SZBgncFIJgP9VfLSrPq1m78MHHXzanKxPb7kXoRECcenhBo yIQQ== 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=nkSl1inMpvuvkN+Ej6lt7wMWY0ME+Ef7HkKqG5h0+Mo=; b=y+vIqDfXwYz2jCMBVpzasOgPXGrIZbUxqu8Q+LQCNQuRcHiI8bOL9jufNKFR4GH0fK s8Eu23/ehD/bCPP0qYmsZt8HX6tTHrSY1RzUstQmd4Nw1BU/RUE+IW2SCG1EfBYGiiWs 4lvYPTZaQexuYkMfAy3QE+RRKYlsy/ku+RF9q4l07IpQGsfdZBieHsgwYcfntAGb1Iy1 ChHYjskBKg0cNvMHlKyXps7Nw13LZU4F1cRqHVple0sG/MPa14kRPVt9B2youhbzDWpY 8lb/5uH/tIn96WlyX0sJVp5osMTDG4MmgA2RZohXKyEW2MghDWvF4ugF6H4cm6RzyL9Y xR/Q== X-Gm-Message-State: ACrzQf3Q/MKkEGU6RPJEAtvtyA/VSWmbeO2kQi37ISiyIRYszipRmzc6 VIn3DcNHbdOnF2dnQQQTlaU= X-Google-Smtp-Source: AMsMyM6ahGQHUVH+USq5wTcfIlevhJM1p5e3nEjMiV9BjE060inFT1ykWMpII2siuIfAybtclk04jQ== X-Received: by 2002:a05:6402:170c:b0:457:ded1:d395 with SMTP id y12-20020a056402170c00b00457ded1d395mr5631505edu.103.1664385806944; Wed, 28 Sep 2022 10:23:26 -0700 (PDT) Received: from localhost.localdomain (ip-217-105-46-158.ip.prioritytelecom.net. [217.105.46.158]) by smtp.gmail.com with ESMTPSA id lb6-20020a170907784600b007306a4ecc9dsm2725063ejc.18.2022.09.28.10.23.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Sep 2022 10:23:26 -0700 (PDT) From: Nam Cao To: forest@alittletooquiet.net, gregkh@linuxfoundation.org, dan.carpenter@oracle.com Cc: namcaov@gmail.com, philipp.g.hortmann@gmail.com, linux-kernel@vger.kernel.org, linux-staging@lists.linux.dev Subject: [RFC PATCH v2 4/4] staging: vt6655: implement allocation failure handling Date: Wed, 28 Sep 2022 19:21:50 +0200 Message-Id: <4b88121b8b1aab63c8541c9ed9969315defb4db1.1664384503.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_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. Also split device_alloc_rx_buf() into 2 parts: allocating new buffer and initializing the buffer, so that we can read the old buffer in between. Signed-off-by: Nam Cao Tested-by: Philipp Hortmann --- drivers/staging/vt6655/device_main.c | 33 ++++++++++++++++++---------- 1 file changed, 21 insertions(+), 12 deletions(-) diff --git a/drivers/staging/vt6655/device_main.c b/drivers/staging/vt6655/= device_main.c index c8cae6df7f51..cc952acd9825 100644 --- a/drivers/staging/vt6655/device_main.c +++ b/drivers/staging/vt6655/device_main.c @@ -132,7 +132,8 @@ 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); static void device_init_registers(struct vnt_private *priv); @@ -611,12 +612,13 @@ static int device_init_rd0_ring(struct vnt_private *p= riv) 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; } =20 + device_init_rx_desc(priv, desc); desc->next =3D &priv->aRD0Ring[(i + 1) % priv->opts.rx_descs0]; desc->next_desc =3D cpu_to_le32(curr + sizeof(struct vnt_rx_desc)); } @@ -657,12 +659,13 @@ static int device_init_rd1_ring(struct vnt_private *p= riv) 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; } =20 + device_init_rx_desc(priv, desc); desc->next =3D &priv->aRD1Ring[(i + 1) % priv->opts.rx_descs1]; desc->next_desc =3D cpu_to_le32(curr + sizeof(struct vnt_rx_desc)); } @@ -821,6 +824,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]; @@ -832,13 +836,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)) { + 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; + rd =3D rd->next; break; } + + vnt_receive_frame(priv, rd); + + memcpy(rd->rd_info, &new_info, sizeof(new_info)); + device_init_rx_desc(priv, rd); } =20 priv->pCurrRD[idx] =3D rd; @@ -847,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; @@ -864,15 +871,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