From patchwork Mon Nov 25 02:04:17 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Landden X-Patchwork-Id: 293801 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 9092D2C00A7 for ; Mon, 25 Nov 2013 13:05:25 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753235Ab3KYCFE (ORCPT ); Sun, 24 Nov 2013 21:05:04 -0500 Received: from mail-pd0-f170.google.com ([209.85.192.170]:62835 "EHLO mail-pd0-f170.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752965Ab3KYCFC (ORCPT ); Sun, 24 Nov 2013 21:05:02 -0500 Received: by mail-pd0-f170.google.com with SMTP id g10so4501220pdj.29 for ; Sun, 24 Nov 2013 18:05:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=sender:from:to:cc:subject:date:message-id:in-reply-to:references; bh=9geXS0q22XVVuBuyCt14xhjCG4cACLVw4BCS7OvhqRM=; b=vm6FCVz5AdkCKc58tzYizOCpZfNpN9g/4LNDks5M+in+drTuYPiPPif7XjQntwEF+p pYfrflqKoldTLfHqt7A66MrmVq1P/9CVX8q6DgbUOMm9zw9H+yagdzWpagNvwVlVLNZB fjwne3BzeGG6TsemEnUgcQsSmiC7Z9pDHql75KMtByKQfZr/YQOQdrNOYtGCG2uiFrX3 FUyhaRV/oQAWJIlFf/0XDFq8FsWq+Wa67jRLLXoYLsSWqtZNdOk5IhihCJAsG++lN29C cU08BO32M5LPY7NGXd1lRaf268dOvFJbAAkAYJWV/bU/4wuk869epynMqs6qMaS7jr7k WDDw== X-Received: by 10.66.7.68 with SMTP id h4mr25542736paa.0.1385345101050; Sun, 24 Nov 2013 18:05:01 -0800 (PST) Received: from debian-T61.churchofgit.com (70-89-66-233-ca.sfba.hfc.comcastbusiness.net. [70.89.66.233]) by mx.google.com with ESMTPSA id wp8sm69258346pbc.26.2013.11.24.18.04.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Nov 2013 18:05:00 -0800 (PST) From: Shawn Landden To: Eric Dumazet Cc: Linux Kernel Mailing List , linux-fsdevel@vger.kernel.org, viro@zeniv.linux.org.uk, linux-crypto@vger.kernel.org, netdev@vger.kernel.org, Herbert Xu , Tom Herbert , "David S. Miller" , stable@vger.kernel.org, Shawn Landden Subject: [PATCH] Commit 35f9c09fe (tcp: tcp_sendpages() should call tcp_push() once) added an internal flag MSG_SENDPAGE_NOTLAST, similar to MSG_MORE. Date: Sun, 24 Nov 2013 18:04:17 -0800 Message-Id: <1385345057-1987-1-git-send-email-shawn@churchofgit.com> X-Mailer: git-send-email 1.8.4.4 In-Reply-To: <1385342706.10637.125.camel@edumazet-glaptop2.roam.corp.google.com> References: <1385342706.10637.125.camel@edumazet-glaptop2.roam.corp.google.com> Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org algif_hash and algif_skcipher used MSG_MORE from tcp_sendpages() and need to see the new flag as identical to MSG_MORE. This fixes sendfile() on AF_ALG. Cc: Tom Herbert Cc: Eric Dumazet Cc: David S. Miller Cc: # 3.4.x + 3.2.x Reported-and-tested-by: Shawn Landden Original-patch: Richard Weinberger Signed-off-by: Shawn Landden --- crypto/algif_hash.c | 3 +++ crypto/algif_skcipher.c | 3 +++ 2 files changed, 6 insertions(+) diff --git a/crypto/algif_hash.c b/crypto/algif_hash.c index ef5356c..8502462 100644 --- a/crypto/algif_hash.c +++ b/crypto/algif_hash.c @@ -114,6 +114,9 @@ static ssize_t hash_sendpage(struct socket *sock, struct page *page, struct hash_ctx *ctx = ask->private; int err; + if (flags & MSG_SENDPAGE_NOTLAST) + flags |= MSG_MORE; + lock_sock(sk); sg_init_table(ctx->sgl.sg, 1); sg_set_page(ctx->sgl.sg, page, size, offset); diff --git a/crypto/algif_skcipher.c b/crypto/algif_skcipher.c index 6a6dfc0..a19c027 100644 --- a/crypto/algif_skcipher.c +++ b/crypto/algif_skcipher.c @@ -378,6 +378,9 @@ static ssize_t skcipher_sendpage(struct socket *sock, struct page *page, struct skcipher_sg_list *sgl; int err = -EINVAL; + if (flags & MSG_SENDPAGE_NOTLAST) + flags |= MSG_MORE; + lock_sock(sk); if (!ctx->more && ctx->used) goto unlock;