From patchwork Wed Jun 6 16:33:28 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Doron Roberts-Kedes X-Patchwork-Id: 925956 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 (mailfrom) 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=fb.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=fb.com header.i=@fb.com header.b="Ru315p7H"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 411Dlf5NJ6z9ry1 for ; Thu, 7 Jun 2018 02:34:22 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933049AbeFFQeT (ORCPT ); Wed, 6 Jun 2018 12:34:19 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:39404 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932514AbeFFQeS (ORCPT ); Wed, 6 Jun 2018 12:34:18 -0400 Received: from pps.filterd (m0044008.ppops.net [127.0.0.1]) by mx0a-00082601.pphosted.com (8.16.0.22/8.16.0.22) with SMTP id w56GXM5n023937 for ; Wed, 6 Jun 2018 09:34:17 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=fb.com; h=from : to : cc : subject : date : message-id : mime-version : content-type; s=facebook; bh=tyiXvBdQcdA7OHRrUzNnTV1N0w/hr671XpNFTpfmJe0=; b=Ru315p7HEFYFvmohnPw67x6Yeo5Yn60GPUqjcfgPOLLVwdBjPFUzq70ZqTVHC7tOqSEv 2CZT5xpHoR65pGUE08Lo1tjb2MLbGSGNwbhavPu8P3m/fiIQxCu6xxJ4RlbcdaYyrjcO DAwLUwYuvXy1AEjzFm68oLuZZOLzrJyQyJo= Received: from mail.thefacebook.com ([199.201.64.23]) by mx0a-00082601.pphosted.com with ESMTP id 2jejag86wm-1 (version=TLSv1 cipher=ECDHE-RSA-AES256-SHA bits=256 verify=NOT) for ; Wed, 06 Jun 2018 09:34:17 -0700 Received: from mx-out.facebook.com (192.168.52.123) by mail.thefacebook.com (192.168.16.14) with Microsoft SMTP Server (TLS) id 14.3.361.1; Wed, 6 Jun 2018 09:34:16 -0700 Received: by devvm32402.prn1.facebook.com (Postfix, from userid 140145) id 98B0632F4B3D; Wed, 6 Jun 2018 09:34:16 -0700 (PDT) Smtp-Origin-Hostprefix: devvm From: Doron Roberts-Kedes Smtp-Origin-Hostname: devvm32402.prn1.facebook.com To: "David S. Miller" CC: Dave Watson , Tom Herbert , Vakul Garg , , Doron Roberts-Kedes Smtp-Origin-Cluster: prn1c35 Subject: [PATCH net-next] strparser: Add __strp_unpause and use it in ktls. Date: Wed, 6 Jun 2018 09:33:28 -0700 Message-ID: <20180606163328.757943-1-doronrk@fb.com> X-Mailer: git-send-email 2.9.5 X-FB-Internal: Safe MIME-Version: 1.0 X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10434:, , definitions=2018-06-06_07:, , signatures=0 X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org strp_unpause queues strp_work in order to parse any messages that arrived while the strparser was paused. However, the process invoking strp_unpause could eagerly parse a buffered message itself if it held the sock lock. __strp_unpause is an alternative to strp_pause that avoids the scheduling overhead that results when a receiving thread unpauses the strparser and waits for the next message to be delivered by the workqueue thread. This patch more than doubled the IOPS achieved in a benchmark of NBD traffic encrypted using ktls. Signed-off-by: Doron Roberts-Kedes --- include/net/strparser.h | 2 ++ net/strparser/strparser.c | 13 +++++++++++++ net/tls/tls_sw.c | 2 +- 3 files changed, 16 insertions(+), 1 deletion(-) diff --git a/include/net/strparser.h b/include/net/strparser.h index d96b59f..f177c87 100644 --- a/include/net/strparser.h +++ b/include/net/strparser.h @@ -90,6 +90,8 @@ static inline void strp_pause(struct strparser *strp) /* May be called without holding lock for attached socket */ void strp_unpause(struct strparser *strp); +/* Must be called with process lock held (lock_sock) */ +void __strp_unpause(struct strparser *strp); static inline void save_strp_stats(struct strparser *strp, struct strp_aggr_stats *agg_stats) diff --git a/net/strparser/strparser.c b/net/strparser/strparser.c index 092bebc..1a96951 100644 --- a/net/strparser/strparser.c +++ b/net/strparser/strparser.c @@ -512,6 +512,19 @@ int strp_init(struct strparser *strp, struct sock *sk, } EXPORT_SYMBOL_GPL(strp_init); +/* Sock process lock held (lock_sock) */ +void __strp_unpause(struct strparser *strp) +{ + strp->paused = 0; + + if (strp->need_bytes) { + if (strp_peek_len(strp) < strp->need_bytes) + return; + } + strp_read_sock(strp); +} +EXPORT_SYMBOL_GPL(__strp_unpause); + void strp_unpause(struct strparser *strp) { strp->paused = 0; diff --git a/net/tls/tls_sw.c b/net/tls/tls_sw.c index 839e1e1..8ca57d0 100644 --- a/net/tls/tls_sw.c +++ b/net/tls/tls_sw.c @@ -735,7 +735,7 @@ static bool tls_sw_advance_skb(struct sock *sk, struct sk_buff *skb, /* Finished with message */ ctx->recv_pkt = NULL; kfree_skb(skb); - strp_unpause(&ctx->strp); + __strp_unpause(&ctx->strp); return true; }