From owner-svn-src-stable-11@freebsd.org Mon Sep 11 18:31:52 2017 Return-Path: Delivered-To: svn-src-stable-11@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 5A340E1BE11; Mon, 11 Sep 2017 18:31:52 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 260586C877; Mon, 11 Sep 2017 18:31:52 +0000 (UTC) (envelope-from mav@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v8BIVpwj069761; Mon, 11 Sep 2017 18:31:51 GMT (envelope-from mav@FreeBSD.org) Received: (from mav@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8BIVpjq069760; Mon, 11 Sep 2017 18:31:51 GMT (envelope-from mav@FreeBSD.org) Message-Id: <201709111831.v8BIVpjq069760@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: mav set sender to mav@FreeBSD.org using -f From: Alexander Motin Date: Mon, 11 Sep 2017 18:31:51 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org Subject: svn commit: r323452 - stable/11/sys/dev/ntb X-SVN-Group: stable-11 X-SVN-Commit-Author: mav X-SVN-Commit-Paths: stable/11/sys/dev/ntb X-SVN-Commit-Revision: 323452 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-stable-11@freebsd.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: SVN commit messages for only the 11-stable src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 11 Sep 2017 18:31:52 -0000 Author: mav Date: Mon Sep 11 18:31:51 2017 New Revision: 323452 URL: https://svnweb.freebsd.org/changeset/base/323452 Log: MFC r322981: Mask doorbells while processing them. This fixes interrupt storms on hardware using legacy level-triggered interrupts, since doorbell processing could take time after interrupt handler completion, that triggered extra interrupts in a loop. Modified: stable/11/sys/dev/ntb/ntb_transport.c Directory Properties: stable/11/ (props changed) Modified: stable/11/sys/dev/ntb/ntb_transport.c ============================================================================== --- stable/11/sys/dev/ntb/ntb_transport.c Mon Sep 11 18:30:50 2017 (r323451) +++ stable/11/sys/dev/ntb/ntb_transport.c Mon Sep 11 18:31:51 2017 (r323452) @@ -835,6 +835,7 @@ static void ntb_transport_rxc_db(void *arg, int pending __unused) { struct ntb_transport_qp *qp = arg; + uint64_t qp_mask = 1ull << qp->qp_num; int rc; CTR0(KTR_NTB, "RX: transport_rx"); @@ -843,11 +844,13 @@ again: ; CTR1(KTR_NTB, "RX: process_rxc returned %d", rc); - if ((ntb_db_read(qp->dev) & (1ull << qp->qp_num)) != 0) { + if ((ntb_db_read(qp->dev) & qp_mask) != 0) { /* If db is set, clear it and check queue once more. */ - ntb_db_clear(qp->dev, 1ull << qp->qp_num); + ntb_db_clear(qp->dev, qp_mask); goto again; } + if (qp->link_is_up) + ntb_db_clear_mask(qp->dev, qp_mask); } static int @@ -1009,6 +1012,8 @@ ntb_transport_doorbell_callback(void *data, uint32_t v vec_mask &= nt->qp_bitmap; if ((vec_mask & (vec_mask - 1)) != 0) vec_mask &= ntb_db_read(nt->dev); + if (vec_mask != 0) + ntb_db_set_mask(nt->dev, vec_mask); while (vec_mask != 0) { qp_num = ffsll(vec_mask) - 1;