From patchwork Mon Nov 25 02:08:59 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Shawn Landden X-Patchwork-Id: 293805 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 1AA212C0146 for ; Mon, 25 Nov 2013 13:09:50 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753269Ab3KYCJc (ORCPT ); Sun, 24 Nov 2013 21:09:32 -0500 Received: from mail-pd0-f173.google.com ([209.85.192.173]:56813 "EHLO mail-pd0-f173.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752997Ab3KYCJa (ORCPT ); Sun, 24 Nov 2013 21:09:30 -0500 Received: by mail-pd0-f173.google.com with SMTP id p10so4476504pdj.18 for ; Sun, 24 Nov 2013 18:09:29 -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=xz5QXkbY3CL8smhe9JERU0sV3AxgVtO1TAMAGpSTULo=; b=A4gs1j1RD8WhR3s6FT6dkJXn8ke6tjcx60ltB3XGOkwtq+D9/dD2WU89DXCNwtyqHd sZrggnB8QM/huOCGe+DHp0tq0fcL+OWDGGK6wFu8JQ9+/gSybeiyhNKJoH2+bL+dPbZI 472j7kBmChOjHetsVE/jtgggc2cP73n/6OjfGE5dS9oehPfwKsgwqf8yrBMY5gxQbzmR 8r68zvcvmYvmjs0Xx+48pePMihg4ZOitxKTC+P9sGVJfyCJrUvozz7gPvHK9VnHAfHkb qm6q2Xv258DBjO0jVTbmypoqXi6pqYjFZy5rK0xSY3pw3esuLTNIMjiasalhv5SDEVaN MuMQ== X-Received: by 10.66.255.39 with SMTP id an7mr24767851pad.7.1385345369720; Sun, 24 Nov 2013 18:09:29 -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 ik1sm42474048pbc.9.2013.11.24.18.09.28 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sun, 24 Nov 2013 18:09:29 -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] update consumers of MSG_MORE to recognize MSG_SENDPAGE_NOTLAST Date: Sun, 24 Nov 2013 18:08:59 -0800 Message-Id: <1385345339-2184-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 Commit 35f9c09fe (tcp: tcp_sendpages() should call tcp_push() once) added an internal flag MSG_SENDPAGE_NOTLAST, similar to MSG_MORE. 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;