From patchwork Tue Mar 24 14:13:46 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuval Basson X-Patchwork-Id: 1260706 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=marvell.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=marvell.com header.i=@marvell.com header.a=rsa-sha256 header.s=pfpt0818 header.b=OUWtuR6y; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48mtfz33Ycz9sTP for ; Wed, 25 Mar 2020 01:19:39 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728026AbgCXOTi (ORCPT ); Tue, 24 Mar 2020 10:19:38 -0400 Received: from mx0b-0016f401.pphosted.com ([67.231.156.173]:60316 "EHLO mx0b-0016f401.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727223AbgCXOTh (ORCPT ); Tue, 24 Mar 2020 10:19:37 -0400 Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 02OEAiCo017480; Tue, 24 Mar 2020 07:19:35 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=pfpt0818; bh=StYw9Nn+QHHnHMBdWEp4CPugOfAxI4/0dSupbp2sta4=; b=OUWtuR6y4Z+R1iEk4sme/zBkmp+tKQwxET7RH0ze0WC0DsEDPv7YJT2RaqTjM9UGdVTw EkB4ob4jyPRHmtkedCeBUzfKMTybq1GvOMpBhilxPTu1QTUaqe/P/Wp3U3lJ2X9JF/6X mSLg71/8tal/tkM96tig/hYyMCKmI+eCxp+POKgZ1gNkhmL8e2wsS9D1/+ljG3VE2Hq1 H0z8X1ZsN7YtpmuOZu9evLkhoB02OjykU0ekm+2yLmicQWglzRN0khOvFzR48vZe1Go1 1R7gELQ+6S7jOoVQzyxU+vAjWpl7AI8K2RtdLVESPyz2fqqoGQODXKQk8AEUA6nX5VxB qA== Received: from sc-exch01.marvell.com ([199.233.58.181]) by mx0b-0016f401.pphosted.com with ESMTP id 2ywvkqsq11-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 24 Mar 2020 07:19:35 -0700 Received: from SC-EXCH03.marvell.com (10.93.176.83) by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 24 Mar 2020 07:19:33 -0700 Received: from maili.marvell.com (10.93.176.43) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 24 Mar 2020 07:19:33 -0700 Received: from lb-tlvb-ybason.il.qlogic.org (unknown [10.5.221.176]) by maili.marvell.com (Postfix) with ESMTP id 84EC43F703F; Tue, 24 Mar 2020 07:19:32 -0700 (PDT) From: Yuval Basson To: , CC: Yuval Basson , Denis Bolotin Subject: [PATCH net-next 1/3] qed: Replace wq_active Boolean with an atomic QED_SLOWPATH_ACTIVE flag Date: Tue, 24 Mar 2020 16:13:46 +0200 Message-ID: <20200324141348.7897-2-ybason@marvell.com> X-Mailer: git-send-email 2.14.5 In-Reply-To: <20200324141348.7897-1-ybason@marvell.com> References: <20200324141348.7897-1-ybason@marvell.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.645 definitions=2020-03-24_05:2020-03-23,2020-03-24 signatures=0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org The atomic opertaion might prevent a potential race condition. Signed-off-by: Yuval Basson Signed-off-by: Denis Bolotin --- drivers/net/ethernet/qlogic/qed/qed.h | 2 +- drivers/net/ethernet/qlogic/qed/qed_main.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qed/qed.h b/drivers/net/ethernet/qlogic/qed/qed.h index fa41bf0..ca866c2 100644 --- a/drivers/net/ethernet/qlogic/qed/qed.h +++ b/drivers/net/ethernet/qlogic/qed/qed.h @@ -565,6 +565,7 @@ struct qed_simd_fp_handler { enum qed_slowpath_wq_flag { QED_SLOWPATH_MFW_TLV_REQ, QED_SLOWPATH_PERIODIC_DB_REC, + QED_SLOWPATH_ACTIVE, }; struct qed_hwfn { @@ -700,7 +701,6 @@ struct qed_hwfn { unsigned long iov_task_flags; #endif struct z_stream_s *stream; - bool slowpath_wq_active; struct workqueue_struct *slowpath_wq; struct delayed_work slowpath_task; unsigned long slowpath_task_flags; diff --git a/drivers/net/ethernet/qlogic/qed/qed_main.c b/drivers/net/ethernet/qlogic/qed/qed_main.c index 2c189c6..016d658 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_main.c +++ b/drivers/net/ethernet/qlogic/qed/qed_main.c @@ -1095,7 +1095,7 @@ static int qed_slowpath_delayed_work(struct qed_hwfn *hwfn, enum qed_slowpath_wq_flag wq_flag, unsigned long delay) { - if (!hwfn->slowpath_wq_active) + if (!test_bit(QED_SLOWPATH_ACTIVE, &hwfn->slowpath_task_flags)) return -EINVAL; /* Memory barrier for setting atomic bit */ @@ -1133,7 +1133,8 @@ static void qed_slowpath_wq_stop(struct qed_dev *cdev) continue; /* Stop queuing new delayed works */ - cdev->hwfns[i].slowpath_wq_active = false; + clear_bit(QED_SLOWPATH_ACTIVE, + &cdev->hwfns[i].slowpath_task_flags); /* Wait until the last periodic doorbell recovery is executed */ while (test_bit(QED_SLOWPATH_PERIODIC_DB_REC, @@ -1153,7 +1154,7 @@ static void qed_slowpath_task(struct work_struct *work) struct qed_ptt *ptt = qed_ptt_acquire(hwfn); if (!ptt) { - if (hwfn->slowpath_wq_active) + if (test_bit(QED_SLOWPATH_ACTIVE, &hwfn->slowpath_task_flags)) queue_delayed_work(hwfn->slowpath_wq, &hwfn->slowpath_task, 0); @@ -1199,7 +1200,7 @@ static int qed_slowpath_wq_start(struct qed_dev *cdev) } INIT_DELAYED_WORK(&hwfn->slowpath_task, qed_slowpath_task); - hwfn->slowpath_wq_active = true; + set_bit(QED_SLOWPATH_ACTIVE, &hwfn->slowpath_task_flags); } return 0; From patchwork Tue Mar 24 14:13:47 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuval Basson X-Patchwork-Id: 1260708 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=marvell.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=marvell.com header.i=@marvell.com header.a=rsa-sha256 header.s=pfpt0818 header.b=kUTS6cv4; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48mtg04w7Rz9sTT for ; Wed, 25 Mar 2020 01:19:40 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728056AbgCXOTj (ORCPT ); Tue, 24 Mar 2020 10:19:39 -0400 Received: from mx0a-0016f401.pphosted.com ([67.231.148.174]:35336 "EHLO mx0b-0016f401.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1727769AbgCXOTi (ORCPT ); Tue, 24 Mar 2020 10:19:38 -0400 Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 02OEARi7015523; Tue, 24 Mar 2020 07:19:37 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=pfpt0818; bh=tz+0Oy1oseAKyHRCMNHycaB+NEa39ZNWpwVHfTPN4u0=; b=kUTS6cv4drNENMYBiEGQaFrBrEeT6npOgw4IH4RCeFxbbmlBAZGrxNpECM8qrBiUen/F 5oQq7PJJwZoRARNlYmnerfr487EaUyB/7fIwmKsoBnaHTqvRmZWRAzDKwADG41bWW3ck PujS5/KqnPbvUab443afhJxn7OTBHNosQZfYRyX4xct1ZGdyGlXGgWnN/1U6dZrtl7bF fk8P879hgIh11cEGT/pay9nbwZ5m4+9+jIzS8WUdHwFZUfoggeADcs99eOCnSgoDPvIn CDr2R8tveHVAkcNv0MVUCGq+cbkFokxjdrAp//aQrTiLUaCdjUyHtvBxRKdGh3SmLqb0 8Q== Received: from sc-exch02.marvell.com ([199.233.58.182]) by mx0a-0016f401.pphosted.com with ESMTP id 2ywg9nkhbb-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 24 Mar 2020 07:19:37 -0700 Received: from SC-EXCH03.marvell.com (10.93.176.83) by SC-EXCH02.marvell.com (10.93.176.82) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 24 Mar 2020 07:19:36 -0700 Received: from maili.marvell.com (10.93.176.43) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 24 Mar 2020 07:19:36 -0700 Received: from lb-tlvb-ybason.il.qlogic.org (unknown [10.5.221.176]) by maili.marvell.com (Postfix) with ESMTP id BB8883F703F; Tue, 24 Mar 2020 07:19:34 -0700 (PDT) From: Yuval Basson To: , CC: Yuval Basson , Denis Bolotin Subject: [PATCH net-next 2/3] qed: Add a flag for rescheduling the slowpath task Date: Tue, 24 Mar 2020 16:13:47 +0200 Message-ID: <20200324141348.7897-3-ybason@marvell.com> X-Mailer: git-send-email 2.14.5 In-Reply-To: <20200324141348.7897-1-ybason@marvell.com> References: <20200324141348.7897-1-ybason@marvell.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.645 definitions=2020-03-24_05:2020-03-23,2020-03-24 signatures=0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Rechedule delayed work in case ptt_acquire failed. Since it is the same task don't reset task's flags. Signed-off-by: Yuval Basson Signed-off-by: Denis Bolotin --- drivers/net/ethernet/qlogic/qed/qed.h | 1 + drivers/net/ethernet/qlogic/qed/qed_main.c | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qed/qed.h b/drivers/net/ethernet/qlogic/qed/qed.h index ca866c2..e3b238e 100644 --- a/drivers/net/ethernet/qlogic/qed/qed.h +++ b/drivers/net/ethernet/qlogic/qed/qed.h @@ -566,6 +566,7 @@ enum qed_slowpath_wq_flag { QED_SLOWPATH_MFW_TLV_REQ, QED_SLOWPATH_PERIODIC_DB_REC, QED_SLOWPATH_ACTIVE, + QED_SLOWPATH_RESCHEDULE, }; struct qed_hwfn { diff --git a/drivers/net/ethernet/qlogic/qed/qed_main.c b/drivers/net/ethernet/qlogic/qed/qed_main.c index 016d658..fb13863 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_main.c +++ b/drivers/net/ethernet/qlogic/qed/qed_main.c @@ -1098,10 +1098,13 @@ static int qed_slowpath_delayed_work(struct qed_hwfn *hwfn, if (!test_bit(QED_SLOWPATH_ACTIVE, &hwfn->slowpath_task_flags)) return -EINVAL; - /* Memory barrier for setting atomic bit */ - smp_mb__before_atomic(); - set_bit(wq_flag, &hwfn->slowpath_task_flags); - smp_mb__after_atomic(); + if (wq_flag != QED_SLOWPATH_RESCHEDULE) { + /* Memory barrier for setting atomic bit */ + smp_mb__before_atomic(); + set_bit(wq_flag, &hwfn->slowpath_task_flags); + smp_mb__after_atomic(); + } + queue_delayed_work(hwfn->slowpath_wq, &hwfn->slowpath_task, delay); return 0; @@ -1155,8 +1158,8 @@ static void qed_slowpath_task(struct work_struct *work) if (!ptt) { if (test_bit(QED_SLOWPATH_ACTIVE, &hwfn->slowpath_task_flags)) - queue_delayed_work(hwfn->slowpath_wq, - &hwfn->slowpath_task, 0); + qed_slowpath_delayed_work(hwfn, + QED_SLOWPATH_RESCHEDULE, 0); return; } From patchwork Tue Mar 24 14:13:48 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Yuval Basson X-Patchwork-Id: 1260709 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (no SPF record) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=marvell.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=marvell.com header.i=@marvell.com header.a=rsa-sha256 header.s=pfpt0818 header.b=aLU/7BPK; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 48mtg302v1z9sW1 for ; Wed, 25 Mar 2020 01:19:43 +1100 (AEDT) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728080AbgCXOTm (ORCPT ); Tue, 24 Mar 2020 10:19:42 -0400 Received: from mx0b-0016f401.pphosted.com ([67.231.156.173]:63146 "EHLO mx0b-0016f401.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727464AbgCXOTl (ORCPT ); Tue, 24 Mar 2020 10:19:41 -0400 Received: from pps.filterd (m0045851.ppops.net [127.0.0.1]) by mx0b-0016f401.pphosted.com (8.16.0.42/8.16.0.42) with SMTP id 02OEAdRw017443; Tue, 24 Mar 2020 07:19:40 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : in-reply-to : references : mime-version : content-type; s=pfpt0818; bh=AJOql5yoGOPf2k7TOIU9hoLBZ0yo3+jqrmvIpwacCRU=; b=aLU/7BPK45GbVmFaADBkfTlDaZNUfUttr1fJpGCbBOy2/GifIZB72ftEVwNtSA9dETMk y38jese6zSBbcVARwaDKaWt6ERjPXsHuySlZH4SUj85dQgMPSSm5F+NrxpWrf3QMc14u ilSst9XcyoytGkBpya3cFGEngdRl0orSlcuCxsfo99dLT4ywNlkq0BfJfEFFwvE0AuxE QrdM/ZgdZpCGVQXQqM/mWOQidYgP81S2BiENqHPAr46AO651l1IxiXCS0EhwE4rCjo80 yUx1rcM5J3mnfB9lv/ijgXcEGkkyMevEbftxA4TV0j675tvQ/YYWzlPzr1KghfDJgPrN kw== Received: from sc-exch03.marvell.com ([199.233.58.183]) by mx0b-0016f401.pphosted.com with ESMTP id 2ywvkqsq17-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT); Tue, 24 Mar 2020 07:19:40 -0700 Received: from SC-EXCH01.marvell.com (10.93.176.81) by SC-EXCH03.marvell.com (10.93.176.83) with Microsoft SMTP Server (TLS) id 15.0.1497.2; Tue, 24 Mar 2020 07:19:38 -0700 Received: from maili.marvell.com (10.93.176.43) by SC-EXCH01.marvell.com (10.93.176.81) with Microsoft SMTP Server id 15.0.1497.2 via Frontend Transport; Tue, 24 Mar 2020 07:19:38 -0700 Received: from lb-tlvb-ybason.il.qlogic.org (unknown [10.5.221.176]) by maili.marvell.com (Postfix) with ESMTP id 1D5303F703F; Tue, 24 Mar 2020 07:19:36 -0700 (PDT) From: Yuval Basson To: , CC: Yuval Basson , Denis Bolotin Subject: [PATCH net-next 3/3] qed: Fix race condition between scheduling and destroying the slowpath workqueue Date: Tue, 24 Mar 2020 16:13:48 +0200 Message-ID: <20200324141348.7897-4-ybason@marvell.com> X-Mailer: git-send-email 2.14.5 In-Reply-To: <20200324141348.7897-1-ybason@marvell.com> References: <20200324141348.7897-1-ybason@marvell.com> MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:6.0.138, 18.0.645 definitions=2020-03-24_05:2020-03-23,2020-03-24 signatures=0 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Calling queue_delayed_work concurrently with destroy_workqueue might race to an unexpected outcome - scheduled task after wq is destroyed or other resources (like ptt_pool) are freed (yields NULL pointer dereference). cancel_delayed_work prevents the race by cancelling the timer triggered for scheduling a new task. Signed-off-by: Yuval Basson Signed-off-by: Denis Bolotin --- drivers/net/ethernet/qlogic/qed/qed_main.c | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/drivers/net/ethernet/qlogic/qed/qed_main.c b/drivers/net/ethernet/qlogic/qed/qed_main.c index fb13863..ade927d 100644 --- a/drivers/net/ethernet/qlogic/qed/qed_main.c +++ b/drivers/net/ethernet/qlogic/qed/qed_main.c @@ -1087,9 +1087,6 @@ static void qed_update_pf_params(struct qed_dev *cdev, #define QED_PERIODIC_DB_REC_INTERVAL_MS 100 #define QED_PERIODIC_DB_REC_INTERVAL \ msecs_to_jiffies(QED_PERIODIC_DB_REC_INTERVAL_MS) -#define QED_PERIODIC_DB_REC_WAIT_COUNT 10 -#define QED_PERIODIC_DB_REC_WAIT_INTERVAL \ - (QED_PERIODIC_DB_REC_INTERVAL_MS / QED_PERIODIC_DB_REC_WAIT_COUNT) static int qed_slowpath_delayed_work(struct qed_hwfn *hwfn, enum qed_slowpath_wq_flag wq_flag, @@ -1126,7 +1123,7 @@ void qed_periodic_db_rec_start(struct qed_hwfn *p_hwfn) static void qed_slowpath_wq_stop(struct qed_dev *cdev) { - int i, sleep_count = QED_PERIODIC_DB_REC_WAIT_COUNT; + int i; if (IS_VF(cdev)) return; @@ -1139,13 +1136,7 @@ static void qed_slowpath_wq_stop(struct qed_dev *cdev) clear_bit(QED_SLOWPATH_ACTIVE, &cdev->hwfns[i].slowpath_task_flags); - /* Wait until the last periodic doorbell recovery is executed */ - while (test_bit(QED_SLOWPATH_PERIODIC_DB_REC, - &cdev->hwfns[i].slowpath_task_flags) && - sleep_count--) - msleep(QED_PERIODIC_DB_REC_WAIT_INTERVAL); - - flush_workqueue(cdev->hwfns[i].slowpath_wq); + cancel_delayed_work(&cdev->hwfns[i].slowpath_task); destroy_workqueue(cdev->hwfns[i].slowpath_wq); } }