Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
From:   Sasha Levin <Alexander.Levin@microsoft.com>
To:     Max Gurtovoy <maxg@mellanox.com>
CC:     "stable@vger.kernel.org" <stable@vger.kernel.org>,
        "linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
        Sagi Grimberg <sagi@grimberg.me>,
        Bart Van Assche <bart.vanassche@wdc.com>,
        Doug Ledford <dledford@redhat.com>
Subject: Re: [PATCH AUTOSEL for 4.14 039/161] IB/cq: Don't force
 IB_POLL_DIRECT poll context for ib_process_cq_direct
Thread-Topic: [PATCH AUTOSEL for 4.14 039/161] IB/cq: Don't force
 IB_POLL_DIRECT poll context for ib_process_cq_direct
Thread-Index: AQHTz5iIg1M3hBrmkEqs12Sly5FN3aP4nm+AgAlSvYA=
Date:   Sun, 15 Apr 2018 14:43:58 +0000
Message-ID: <20180415144357.GQ2341@sasha-vm>
References: <20180409001936.162706-1-alexander.levin@microsoft.com>
 <20180409001936.162706-39-alexander.levin@microsoft.com>
 <49117250-bfbf-53c2-8178-5359a08ef3de@mellanox.com>
In-Reply-To: <49117250-bfbf-53c2-8178-5359a08ef3de@mellanox.com>
Accept-Language: en-US
Content-Language: en-US
received-spf: None (protection.outlook.com: microsoft.com does not designate
 permitted sender hosts)
spamdiagnosticoutput: 1:99
spamdiagnosticmetadata: NSPM
Content-Type: text/plain; charset="us-ascii"
Content-ID: <398ADEA95B9CA448AD5D820A4577CF72@namprd21.prod.outlook.com>
Content-Transfer-Encoding: quoted-printable
MIME-Version: 1.0
X-MS-Exchange-CrossTenant-Network-Message-Id: afbba9f6-ee81-46a4-7989-08d5a2df52aa
X-MS-Exchange-CrossTenant-originalarrivaltime: 15 Apr 2018 14:43:58.9362
 (UTC)
X-MS-Exchange-CrossTenant-fromentityheader: Hosted
X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47
X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0983
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

Grabbed it for both 4.14 and 4.15, thanks Max!

On Mon, Apr 09, 2018 at 07:21:29PM +0300, Max Gurtovoy wrote:
>Hi Sasha,
>please consider taking a small fix for this one (also useful for 4.15):
>
>commit d3b9e8ad425cfd5b9116732e057f1b48e4d3bcb8
>Author: Max Gurtovoy <maxg@mellanox.com>
>Date:   Mon Mar 5 20:09:48 2018 +0200
>
>    RDMA/core: Reduce poll batch for direct cq polling
>
>    Fix warning limit for kernel stack consumption:
>
>    drivers/infiniband/core/cq.c: In function 'ib_process_cq_direct':
>    drivers/infiniband/core/cq.c:78:1: error: the frame size of 1032 bytes
>    is larger than 1024 bytes [-Werror=3Dframe-larger-than=3D]
>
>    Using smaller ib_wc array on the stack brings us comfortably below tha=
t
>    limit again.
>
>    Fixes: 246d8b184c10 ("IB/cq: Don't force IB_POLL_DIRECT poll=20
>context for ib_process_cq_direct")
>    Reported-by: Arnd Bergmann <arnd@arndb.de>
>    Reviewed-by: Sergey Gorenko <sergeygo@mellanox.com>
>    Signed-off-by: Max Gurtovoy <maxg@mellanox.com>
>    Signed-off-by: Leon Romanovsky <leonro@mellanox.com>
>    Reviewed-by: Bart Van Assche <bart.vanassche@wdc.com>
>    Acked-by: Arnd Bergmann <arnd@arndb.de>
>    Signed-off-by: Jason Gunthorpe <jgg@mellanox.com>
>
>
>-Max.
>
>
>On 4/9/2018 3:20 AM, Sasha Levin wrote:
>>From: Sagi Grimberg <sagi@grimberg.me>
>>
>>[ Upstream commit 246d8b184c100e8eb6b4e8c88f232c2ed2a4e672 ]
>>
>>polling the completion queue directly does not interfere
>>with the existing polling logic, hence drop the requirement.
>>Be aware that running ib_process_cq_direct with non IB_POLL_DIRECT
>>CQ may trigger concurrent CQ processing.
>>
>>This can be used for polling mode ULPs.
>>
>>Cc: Bart Van Assche <bart.vanassche@wdc.com>
>>Reported-by: Steve Wise <swise@opengridcomputing.com>
>>Signed-off-by: Sagi Grimberg <sagi@grimberg.me>
>>[maxg: added wcs array argument to __ib_process_cq]
>>Signed-off-by: Max Gurtovoy <maxg@mellanox.com>
>>Signed-off-by: Doug Ledford <dledford@redhat.com>
>>Signed-off-by: Sasha Levin <alexander.levin@microsoft.com>
>>---
>>  drivers/infiniband/core/cq.c | 23 +++++++++++++----------
>>  1 file changed, 13 insertions(+), 10 deletions(-)
>>
>>diff --git a/drivers/infiniband/core/cq.c b/drivers/infiniband/core/cq.c
>>index f2ae75fa3128..c8c5a5a7f433 100644
>>--- a/drivers/infiniband/core/cq.c
>>+++ b/drivers/infiniband/core/cq.c
>>@@ -25,9 +25,10 @@
>>  #define IB_POLL_FLAGS \
>>  	(IB_CQ_NEXT_COMP | IB_CQ_REPORT_MISSED_EVENTS)
>>-static int __ib_process_cq(struct ib_cq *cq, int budget)
>>+static int __ib_process_cq(struct ib_cq *cq, int budget, struct ib_wc *p=
oll_wc)
>>  {
>>  	int i, n, completed =3D 0;
>>+	struct ib_wc *wcs =3D poll_wc ? : cq->wc;
>>  	/*
>>  	 * budget might be (-1) if the caller does not
>>@@ -35,9 +36,9 @@ static int __ib_process_cq(struct ib_cq *cq, int budget=
)
>>  	 * minimum here.
>>  	 */
>>  	while ((n =3D ib_poll_cq(cq, min_t(u32, IB_POLL_BATCH,
>>-			budget - completed), cq->wc)) > 0) {
>>+			budget - completed), wcs)) > 0) {
>>  		for (i =3D 0; i < n; i++) {
>>-			struct ib_wc *wc =3D &cq->wc[i];
>>+			struct ib_wc *wc =3D &wcs[i];
>>  			if (wc->wr_cqe)
>>  				wc->wr_cqe->done(cq, wc);
>>@@ -60,18 +61,20 @@ static int __ib_process_cq(struct ib_cq *cq, int budg=
et)
>>   * @cq:		CQ to process
>>   * @budget:	number of CQEs to poll for
>>   *
>>- * This function is used to process all outstanding CQ entries on a
>>- * %IB_POLL_DIRECT CQ.  It does not offload CQ processing to a different
>>- * context and does not ask for completion interrupts from the HCA.
>>+ * This function is used to process all outstanding CQ entries.
>>+ * It does not offload CQ processing to a different context and does
>>+ * not ask for completion interrupts from the HCA.
>>+ * Using direct processing on CQ with non IB_POLL_DIRECT type may trigge=
r
>>+ * concurrent processing.
>>   *
>>   * Note: do not pass -1 as %budget unless it is guaranteed that the num=
ber
>>   * of completions that will be processed is small.
>>   */
>>  int ib_process_cq_direct(struct ib_cq *cq, int budget)
>>  {
>>-	WARN_ON_ONCE(cq->poll_ctx !=3D IB_POLL_DIRECT);
>>+	struct ib_wc wcs[IB_POLL_BATCH];
>>-	return __ib_process_cq(cq, budget);
>>+	return __ib_process_cq(cq, budget, wcs);
>>  }
>>  EXPORT_SYMBOL(ib_process_cq_direct);
>>@@ -85,7 +88,7 @@ static int ib_poll_handler(struct irq_poll *iop, int bu=
dget)
>>  	struct ib_cq *cq =3D container_of(iop, struct ib_cq, iop);
>>  	int completed;
>>-	completed =3D __ib_process_cq(cq, budget);
>>+	completed =3D __ib_process_cq(cq, budget, NULL);
>>  	if (completed < budget) {
>>  		irq_poll_complete(&cq->iop);
>>  		if (ib_req_notify_cq(cq, IB_POLL_FLAGS) > 0)
>>@@ -105,7 +108,7 @@ static void ib_cq_poll_work(struct work_struct *work)
>>  	struct ib_cq *cq =3D container_of(work, struct ib_cq, work);
>>  	int completed;
>>-	completed =3D __ib_process_cq(cq, IB_POLL_BUDGET_WORKQUEUE);
>>+	completed =3D __ib_process_cq(cq, IB_POLL_BUDGET_WORKQUEUE, NULL);
>>  	if (completed >=3D IB_POLL_BUDGET_WORKQUEUE ||
>>  	    ib_req_notify_cq(cq, IB_POLL_FLAGS) > 0)
>>  		queue_work(ib_comp_wq, &cq->work);
>>=