From patchwork Wed Mar 20 14:51:23 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andrey Konovalov X-Patchwork-Id: 10861903 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 0E0C013B5 for ; Wed, 20 Mar 2019 14:52:17 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E852C28DDA for ; Wed, 20 Mar 2019 14:52:16 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id DAE9729CE8; Wed, 20 Mar 2019 14:52:16 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.5 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE, USER_IN_DEF_DKIM_WL autolearn=ham version=3.3.1 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 6F28829D97 for ; Wed, 20 Mar 2019 14:52:16 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id AB8CA6B0266; Wed, 20 Mar 2019 10:52:14 -0400 (EDT) Delivered-To: linux-mm-outgoing@kvack.org Received: by kanga.kvack.org (Postfix, from userid 40) id A6CB96B0269; Wed, 20 Mar 2019 10:52:14 -0400 (EDT) X-Original-To: int-list-linux-mm@kvack.org X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 908246B026A; Wed, 20 Mar 2019 10:52:14 -0400 (EDT) X-Original-To: linux-mm@kvack.org X-Delivered-To: linux-mm@kvack.org Received: from mail-pg1-f197.google.com (mail-pg1-f197.google.com [209.85.215.197]) by kanga.kvack.org (Postfix) with ESMTP id 52C746B0266 for ; Wed, 20 Mar 2019 10:52:14 -0400 (EDT) Received: by mail-pg1-f197.google.com with SMTP id y1so2936608pgo.0 for ; Wed, 20 Mar 2019 07:52:14 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:dkim-signature:date:in-reply-to:message-id :mime-version:references:subject:from:to:cc; bh=JtqBUblhyywi4YhvTkJHhe/ifq9XLr2+qZst5mD5EtU=; b=jo1i7kV/Avnzf3eD7gEwKypwPr+xvGasV6YU4FJqYaC/F8rkMf6Msq3vwj8z5gEkwL Lk0Tdt2jGW0qOtkAPN8+HdH8qAihvRD1YXSYxPk1Kr/fYsi+qZO7C0XudUNeEEY4VYS+ pzKRsg017DKsDR4Nf1ZPLzwr5nb50uct2EJgv3VqXMN7Qfzp9GfQKXfIO9v9jqTFFH+w zvKqfGZ7LMbh33wNmghKfCXYoFMgjZKlzHcDaVqIq0g5YrYKYMh90ezGzJani4JJMur7 A6FDsAAnBmWFaHHfqOdRqNWL5RZeMoq/SCJQ/gWIcrFMiXfDWgE1/GJuBebfah6h+JII yGzw== X-Gm-Message-State: APjAAAWiF4J8Bzx7VJZqP2Zu1l6gbOXxthABpYNjkpkR5hHy1bFJpz2/ 0OFehCJuM3FQFwc4+40T4z4tybOAQ+CXhaqClWwlajTnCKnix+1a4r80OY/pqzLYRTvLJqJCUmu q1p9nb8v6zkzVEU+rGKZcf1DtB/O1gFtEryDe8p0Xc4kAxTsCG6ApacGZ4koY3dFQlw== X-Received: by 2002:a17:902:b687:: with SMTP id c7mr8429396pls.270.1553093533878; Wed, 20 Mar 2019 07:52:13 -0700 (PDT) X-Received: by 2002:a17:902:b687:: with SMTP id c7mr8429322pls.270.1553093532900; Wed, 20 Mar 2019 07:52:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1553093532; cv=none; d=google.com; s=arc-20160816; b=xQeeHTjapLLkiO/1tVv6O1ANt9JYDLoLQLuSL8xCfTjg3PIsnzVeez8lsS7nrElcS7 +xKPP9381dsnph3evUbHhNRTFknYLaTnbEE9LnHYwGgzGvlXGHXUZFc2ucaKHhH6B9n9 rgHvB8iu2azbnyTHQmjS1mrxfa9gufVFk89aEYxaxNHTMmjd6vWXrWO6f3nEMlGEHs2F mIUBHJYRzb1Pvl8H5G2jnwuRiMIQH1dFyp9e+yksA45XG/JjTJ58M606P5vBo23KC6+j kEbtBPCYHPZPNg8MhShfdHW4EXzk+olIcxVLH1JbugGBs3Inp4ar2yc8IEdig9iqEcbc Pr5g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=cc:to:from:subject:references:mime-version:message-id:in-reply-to :date:dkim-signature; bh=JtqBUblhyywi4YhvTkJHhe/ifq9XLr2+qZst5mD5EtU=; b=tXGH23f9CXsoNt0uOqO9Awlq4XrnL+EdKdVRWPdCNF5lauzFKqQdiSavHtYX+Oa7ER Xq04/z4ISmOvQchpFKFKPH5skslNybL+vml144Q7FPPv+ksZ7UDXDZ9/hV6H1D6GGTLo enJrgcAdE1zDN8P8w8gJdy80tJ6dhzv7VlcjMGyRTSaI4cllHulIF9oEb7o5e1Tupp7s 4jUtnd5uwrOcEJDfgD5W8HWpb75BSO7Gg393OvenZhAAkrXzjfkZY4gVbnHiPv6tGViq N4afKDfFLpXq322eP9Ei8O1w5D/tN15rYCk1K2XVuS29VEk62UlbqjJbAbRklN9nmcK+ zuUg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=JCUhTsom; spf=pass (google.com: domain of 3nfosxaokchcviymztfiqgbjjbgz.xjhgdips-hhfqvxf.jmb@flex--andreyknvl.bounces.google.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=3nFOSXAoKCHcViYmZtfiqgbjjbgZ.Xjhgdips-hhfqVXf.jmb@flex--andreyknvl.bounces.google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from mail-sor-f73.google.com (mail-sor-f73.google.com. [209.85.220.73]) by mx.google.com with SMTPS id d19sor2556767pgh.19.2019.03.20.07.52.12 for (Google Transport Security); Wed, 20 Mar 2019 07:52:12 -0700 (PDT) Received-SPF: pass (google.com: domain of 3nfosxaokchcviymztfiqgbjjbgz.xjhgdips-hhfqvxf.jmb@flex--andreyknvl.bounces.google.com designates 209.85.220.73 as permitted sender) client-ip=209.85.220.73; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=JCUhTsom; spf=pass (google.com: domain of 3nfosxaokchcviymztfiqgbjjbgz.xjhgdips-hhfqvxf.jmb@flex--andreyknvl.bounces.google.com designates 209.85.220.73 as permitted sender) smtp.mailfrom=3nFOSXAoKCHcViYmZtfiqgbjjbgZ.Xjhgdips-hhfqVXf.jmb@flex--andreyknvl.bounces.google.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=JtqBUblhyywi4YhvTkJHhe/ifq9XLr2+qZst5mD5EtU=; b=JCUhTsom3sv4Qp9BgYwbkXDdkciE1//Hw4N0DNNMC4xTTSQ4lLZpC9fonlZAwhGa5s GNZfPO7WKhbqfkLhUEXh2Q2IsqhkYYT63boD5rJQKFDull6EmJ/3UNaGEyGsIksVaOC8 tVa6dAYXJVSE0a/Y3iEyW9RkRqD5ULEHrrYNKdC8hIFFIscPITax04Ehb6yZo3/Kv5gE 4GrdjKthKOiZlqCKJ11zuUzlpowQXS31kWI1psH6mvXWAsMM/BUWqqUj3E1L86ZSFVnv UTo+HsA5H9AlfhMDC0xK9OSBVfCenoUTzBKRmg/WwAJv8lBEwyEQzOI3ORQRTNGew37R fDYw== X-Google-Smtp-Source: APXvYqxTeQTCrSfKvGumpNCKTbPirWsdeFkFdjLvtHz5QB/GJ2l6iQCjaYJVOq8eYP8TPKdTa2JL6S1R/puOA8Yr X-Received: by 2002:a63:1e10:: with SMTP id e16mr1614319pge.103.1553093532279; Wed, 20 Mar 2019 07:52:12 -0700 (PDT) Date: Wed, 20 Mar 2019 15:51:23 +0100 In-Reply-To: Message-Id: <2280b62096ce1fa5c9e9429d18f08f82f4be1b0b.1553093421.git.andreyknvl@google.com> Mime-Version: 1.0 References: X-Mailer: git-send-email 2.21.0.225.g810b269d1ac-goog Subject: [PATCH v13 09/20] net, arm64: untag user pointers in tcp_zerocopy_receive From: Andrey Konovalov To: Catalin Marinas , Will Deacon , Mark Rutland , Robin Murphy , Kees Cook , Kate Stewart , Greg Kroah-Hartman , Andrew Morton , Ingo Molnar , "Kirill A . Shutemov" , Shuah Khan , Vincenzo Frascino , Eric Dumazet , "David S. Miller" , Alexei Starovoitov , Daniel Borkmann , Steven Rostedt , Ingo Molnar , Peter Zijlstra , Arnaldo Carvalho de Melo , Alex Deucher , " =?utf-8?q?Christian_K=C3=B6ni?= =?utf-8?q?g?= " , "David (ChunMing) Zhou" , Yishai Hadas , Mauro Carvalho Chehab , Jens Wiklander , Alex Williamson , linux-arm-kernel@lists.infradead.org, linux-mm@kvack.org, linux-arch@vger.kernel.org, netdev@vger.kernel.org, bpf@vger.kernel.org, amd-gfx@lists.freedesktop.org, dri-devel@lists.freedesktop.org, linux-rdma@vger.kernel.org, linux-media@vger.kernel.org, kvm@vger.kernel.org, linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org Cc: Dmitry Vyukov , Kostya Serebryany , Evgeniy Stepanov , Lee Smith , Ramana Radhakrishnan , Jacob Bramley , Ruben Ayrapetyan , Chintan Pandya , Luc Van Oostenryck , Dave Martin , Kevin Brodsky , Szabolcs Nagy , Andrey Konovalov X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: X-Virus-Scanned: ClamAV using ClamSMTP This patch is a part of a series that extends arm64 kernel ABI to allow to pass tagged user pointers (with the top byte set to something else other than 0x00) as syscall arguments. tcp_zerocopy_receive() uses provided user pointers for vma lookups, which can only by done with untagged pointers. Untag user pointers in this function. Signed-off-by: Andrey Konovalov --- net/ipv4/tcp.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 6baa6dc1b13b..855a1f68c1ea 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -1761,6 +1761,8 @@ static int tcp_zerocopy_receive(struct sock *sk, if (address & (PAGE_SIZE - 1) || address != zc->address) return -EINVAL; + address = untagged_addr(address); + if (sk->sk_state == TCP_LISTEN) return -ENOTCONN;