From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 51C01C76198 for ; Fri, 19 Jul 2019 04:28:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 223D520873 for ; Fri, 19 Jul 2019 04:28:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563510498; bh=CH3O2LPFoEMwAWzghnExfL2XH60fUknYpeXbotU+tPI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=KWjZ9VJ3rXLMQ/ksatsjWCc0Z+TI605iUxw3Vf3WGKwlJkv1cAFC1wR5Fh0MyzDnn moYUm5oLWME5YdqV46hAy/cxg7SAs1vyIpTEJWkdmW9qhJ6h262RCtvsWZ7SGWb/DX hQiiAhZhdxykTfn0zIQtPTEczWHBjkftMg+grJHo= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730706AbfGSEGb (ORCPT ); Fri, 19 Jul 2019 00:06:31 -0400 Received: from mail.kernel.org ([198.145.29.99]:39430 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731041AbfGSEGV (ORCPT ); Fri, 19 Jul 2019 00:06:21 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 28C1E218BA; Fri, 19 Jul 2019 04:06:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563509180; bh=CH3O2LPFoEMwAWzghnExfL2XH60fUknYpeXbotU+tPI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=BR3yCQYMhFHd1fBjZiSyiiIKfOp9uab1arTjeXsuTux/F9Il3bn/hItr4NUE3GeJf TdzY3tSxbegvHW/kTiET/uoHun1jzFSfk1dmPx1mdGvLHhLY6+WKV+2PjA24mSbYgF /2n31MApgMEkFFK2icHUkf0VC0RuJuxByHLL+7Kw= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Mikhail Skorzhinskii , Sagi Grimberg , Christoph Hellwig , Sasha Levin , linux-nvme@lists.infradead.org Subject: [PATCH AUTOSEL 5.1 110/141] nvme-tcp: don't use sendpage for SLAB pages Date: Fri, 19 Jul 2019 00:02:15 -0400 Message-Id: <20190719040246.15945-110-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190719040246.15945-1-sashal@kernel.org> References: <20190719040246.15945-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Mikhail Skorzhinskii [ Upstream commit 37c15219599f7a4baa73f6e3432afc69ba7cc530 ] According to commit a10674bf2406 ("tcp: detecting the misuse of .sendpage for Slab objects") and previous discussion, tcp_sendpage should not be used for pages that is managed by SLAB, as SLAB is not taking page reference counters into consideration. Signed-off-by: Mikhail Skorzhinskii Reviewed-by: Sagi Grimberg Signed-off-by: Christoph Hellwig Signed-off-by: Sasha Levin --- drivers/nvme/host/tcp.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/nvme/host/tcp.c b/drivers/nvme/host/tcp.c index 08a2501b9357..606b13d35d16 100644 --- a/drivers/nvme/host/tcp.c +++ b/drivers/nvme/host/tcp.c @@ -860,7 +860,14 @@ static int nvme_tcp_try_send_data(struct nvme_tcp_request *req) else flags |= MSG_MORE; - ret = kernel_sendpage(queue->sock, page, offset, len, flags); + /* can't zcopy slab pages */ + if (unlikely(PageSlab(page))) { + ret = sock_no_sendpage(queue->sock, page, offset, len, + flags); + } else { + ret = kernel_sendpage(queue->sock, page, offset, len, + flags); + } if (ret <= 0) return ret; -- 2.20.1