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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 8C84BEB64D7 for ; Sun, 18 Jun 2023 16:54:44 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 0FB616B0071; Sun, 18 Jun 2023 12:54:44 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 085306B0072; Sun, 18 Jun 2023 12:54:44 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id E40496B0075; Sun, 18 Jun 2023 12:54:43 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0016.hostedemail.com [216.40.44.16]) by kanga.kvack.org (Postfix) with ESMTP id D16666B0071 for ; Sun, 18 Jun 2023 12:54:43 -0400 (EDT) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 9EA521C7D1D for ; Sun, 18 Jun 2023 16:54:43 +0000 (UTC) X-FDA: 80916467646.02.44202B7 Received: from mail-qv1-f49.google.com (mail-qv1-f49.google.com [209.85.219.49]) by imf22.hostedemail.com (Postfix) with ESMTP id B3D8DC0005 for ; Sun, 18 Jun 2023 16:54:41 +0000 (UTC) Authentication-Results: imf22.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=rY8QSvEl; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf22.hostedemail.com: domain of willemdebruijn.kernel@gmail.com designates 209.85.219.49 as permitted sender) smtp.mailfrom=willemdebruijn.kernel@gmail.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1687107281; a=rsa-sha256; cv=none; b=FUcOcXhYT6s3rh2TAGPMhEs7YE+QpD+kKRcdbvBSKrv68GUYU9MwA25oRG86f6bYgFMFOl jwZ7QeAUrqs4kiv7MUyDLj1wo38/v3rjHGVUr2FxIXqTyXO58iEpdszP2Ir56NeoD6bmuw m7sNkdUTMrp875Bl0dtgFOwUhn9Qp6c= ARC-Authentication-Results: i=1; imf22.hostedemail.com; dkim=pass header.d=gmail.com header.s=20221208 header.b=rY8QSvEl; dmarc=pass (policy=none) header.from=gmail.com; spf=pass (imf22.hostedemail.com: domain of willemdebruijn.kernel@gmail.com designates 209.85.219.49 as permitted sender) smtp.mailfrom=willemdebruijn.kernel@gmail.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1687107281; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=4sK61SVjYCcgummf/cy7pNsLb9SbPBeqU0f1FYDFMyI=; b=atKBKsbJw1l2Bwh53gG0WLuXJMuUMraowU6ZDXh3jISi1VMlgyCRyK4AodKYcSF+f7e+yx a7JtKIN2w+jUaEfGXZizKGgWcOAE5FuaKwiZok+BQ3uvtpqsVSSpCt+Ij+SetRsrbNR9eN FFIhhTCDw0JFYH4iAth5RADOMxB28xU= Received: by mail-qv1-f49.google.com with SMTP id 6a1803df08f44-62ff1cdf079so20518346d6.0 for ; Sun, 18 Jun 2023 09:54:41 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20221208; t=1687107281; x=1689699281; h=content-transfer-encoding:mime-version:subject:references :in-reply-to:message-id:cc:to:from:date:from:to:cc:subject:date :message-id:reply-to; bh=4sK61SVjYCcgummf/cy7pNsLb9SbPBeqU0f1FYDFMyI=; b=rY8QSvEl6p4fIeB+cNXrfBx3Qi8Q0oRZm5VoS2BoCgfjuYRQQUwrdFGEDdU23IrXo0 chGoGHKPwP0LXmrfTl3qHlcCmo1sRYapzINEnQSow+fzi+pFn5PGiApYOrJ50HKaB68T utE+yg2GnzRQ30Bj8a8L69p3c374+UtcDkNfJR34GIn05f0b7+0AmEbyApvKm1DNJWT/ bJcRj7sz29ir/3TzVW+gzb/qTkz7VnAPSgi9enEEZ3+K74hSxYqhdeSEvqiAsjKKoCqT OzoP6N5BMK7b0x2JfdgrfrTiD4DoK57jW0lPFco02d1KYyD6s/pMa/qc2P6IX40592qx JtnA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1687107281; x=1689699281; h=content-transfer-encoding:mime-version:subject:references :in-reply-to:message-id:cc:to:from:date:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=4sK61SVjYCcgummf/cy7pNsLb9SbPBeqU0f1FYDFMyI=; b=CjQqtab/kko1NJXvi0ffhXiLjCjmbQ3Jr9e90WIs7l9QdTqwu4SYh52CZ9Q1jAn12w Bs8eKBE2NqxphKMhUvPdtyLJg2iNIaDTUcIcvIRd3lZT0U9zNuHQonyds0ycnxHet0z+ HZwDrj6vvTJnD+A73OJPrutN7LkmkfSEBoiXeR8nnKBrRbnifSAmeeq0qyK6XzqmTItg jMDwDA0wsI9E1X1jgSXFlre3s1Q9+AxBM4zNxSOfuVxyZYkkcwKlEGqSaXJv7P5xzaog 0vbc1ArP7SF7lugF81jnv8iUilOWltkC9KjlkbG9uQ1nIbI97tSBOlP0EmO9BtCzRl2x pm+Q== X-Gm-Message-State: AC+VfDyX9XtvCZdh1aJM9i0WDnGWiz1f89VTDUTjzRYAHlzORUjlIJV3 0DQ4PPM3jdfjwe76tNCiEGU= X-Google-Smtp-Source: ACHHUZ7rD2n8b5vnYB/xOzS5BAQNWYuxXJrQo4BmBND6gWZP6jCAnPQahStFSM7LauZ1ZKr4AefxaQ== X-Received: by 2002:ad4:5be2:0:b0:626:33bb:3fd3 with SMTP id k2-20020ad45be2000000b0062633bb3fd3mr8290593qvc.19.1687107280821; Sun, 18 Jun 2023 09:54:40 -0700 (PDT) Received: from localhost (172.174.245.35.bc.googleusercontent.com. [35.245.174.172]) by smtp.gmail.com with ESMTPSA id t3-20020ac85303000000b003f7a54fa72fsm1857340qtn.0.2023.06.18.09.54.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 18 Jun 2023 09:54:40 -0700 (PDT) Date: Sun, 18 Jun 2023 12:54:40 -0400 From: Willem de Bruijn To: David Howells , netdev@vger.kernel.org Cc: David Howells , Alexander Duyck , "David S. Miller" , Eric Dumazet , Jakub Kicinski , Paolo Abeni , Willem de Bruijn , David Ahern , Matthew Wilcox , Jens Axboe , linux-mm@kvack.org, linux-kernel@vger.kernel.org, bpf@vger.kernel.org, dccp@vger.kernel.org, linux-afs@lists.infradead.org, linux-arm-msm@vger.kernel.org, linux-can@vger.kernel.org, linux-crypto@vger.kernel.org, linux-doc@vger.kernel.org, linux-hams@vger.kernel.org, linux-perf-users@vger.kernel.org, linux-rdma@vger.kernel.org, linux-sctp@vger.kernel.org, linux-wpan@vger.kernel.org, linux-x25@vger.kernel.org, mptcp@lists.linux.dev, rds-devel@oss.oracle.com, tipc-discussion@lists.sourceforge.net, virtualization@lists.linux-foundation.org Message-ID: <648f36d02fe6e_33cfbc2944f@willemb.c.googlers.com.notmuch> In-Reply-To: <20230617121146.716077-18-dhowells@redhat.com> References: <20230617121146.716077-1-dhowells@redhat.com> <20230617121146.716077-18-dhowells@redhat.com> Subject: RE: [PATCH net-next v2 17/17] net: Kill MSG_SENDPAGE_NOTLAST Mime-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-Rspam-User: X-Rspamd-Server: rspam06 X-Rspamd-Queue-Id: B3D8DC0005 X-Stat-Signature: j1eoqm45t4oa4yhq6x6uy7nr7q1ok9rq X-HE-Tag: 1687107281-497374 X-HE-Meta: U2FsdGVkX198zBFqzPhpZ46Ce+msUX8R51qrRPNIg/GlLx4tud8Idn0VmTUOo03+bsYru5LM+y2TRqOAhHlz7q/oi9KAo9n0q4rn//EHdpZ0WCCKSRL1zdUFt1/5CluSwNvMRrwotO30i/+jHsMK4X96ARg21UCj39aeeUMP/wR9HTA445F0Mj9UE5XO5eszSOIeyEWtJVGseTbuYXV9RujMQo5Bc1Wu7sboQuMW27AfH3rF1keWnGrrl9kQthmJWDsL41cshxBH4IJSdeFdqJTl2Ari4+GD5Yi9QzkT0Fz12SRGcyh36F0jQUSkBOSXcQ5JnfK3kW5KBJ5dkh22sxTv38ATyt3ZK39kCKIR1i6PupU3zUan3+5f/sTPuvQMyVNNxswjBFT9x/OTT54U7HOedoMSa0hX52l6c8gcFLHWO/87OwKb5LJq0Ecf4wOKSxsd8YtX+TDayzrfQlymRP0gBawKgL8cS68GAFTZmeBKscJK5TGwGNRWwnNi8M3xGXW1f4V0fOco0L9JfBMPLEDxNqG5U9DYAL8j3qFRrm9EwfTST+hx+bzcWi6yiPwEC8olKLbgaVBy0uOfrwo/rSje2EhdYiqmRs8psd5DyKp+KUR/T71EnIlCdm6cYK3znJbPGEMQca1dJdO0g75vTYhz1djZd3EoIVSPBHwj5T4K9I8NYsO5MyPpgMFrYlTkwPytYfK3tj1kh7dyxXHwUNyzEGcTJuylYwYYE/0sDvOIOyYx7nN/oJGkVpOltN60AG4pPTcCGQCZArMx+0gKBxrnNZUtSmA43wiH7qR65hRLEI21wBCbfN2t6HW1YPb0Pj9i9pStzKq97o+R1jA2T2QpUyEJpfiESdxwos/SLIeB/dm7PNMwU4WVeG8sP06v4vSKFJO6WaIros6XV4LJuGD2cEPzuU9U4Zrikvt6Yto2FdM4j5XLpgm7uOR/q//NEAbKlEvr0AGRUKDZOE/ x8vkvOBw t/5xzo/ykocA9WfslpE6JPA5CPxHBw7Vg7gaRZbRwQ4cQVBTnpV4ej8ZRxFxdm4nB2S6PwzUZdgGUsauOlh4L7F5z4f7LxRaQ0SUrFgunlfviZlIoJRHnNISbysEqFXRTlIcH6d3GtOlY3UkTMfFZ6IaNCSwxK9oHNm0E+3FfFcYUdm3dhV+jjKBbmgRyijlk2miPUJZNZ4sXQhVUATFPXTtd1XQgJuhjDNzxwARzGekq9TqYepZgiWlTMBYiGpF33fG56xyzEyxgJ+IX2eHlzG96CC+kcUPVQLOf0Lr53ZVehHkv/4WDmFCt3h7uFX6S9evKCr0tFaMDD9vqVXh2/lHHdSWnFfEGCc2n8pDx3xt73C+zzrOoIN3EwNwWUXlEWH8UFcrwy0yNqEtIUHnv101djd8OFn0PNOQRP2qqhZKdBE6EEwaIoXuyTMp9YjRJ85srPm5q+t1lhhA7vJ/5VFzDgGJShntsbXissh2Wh50c9LH5idV3d68BcSjLOdEwjU6rbQRKjJMvwvwTI6fKie3GuaU2cZq0OaBVjNBp0tA8qbEFYUjtYUdIr/MQerHu+LZUhIz5eNqsNuXbQkQilUXNNcLVt8dZoVZ5CIbauU5i7zNdIloLim2Ov4mctvogkjBLmVBp3qX0N41KHdKsiE+u8+d72yKgTXdNepTc4RZj92SlGD+C/F0RJEx5V468Ger6JEv7gOvHLTun3beZiMmqHurdNx+GdYb8VnEBV7G3XiaweraZPiZFz29AZ9kpOf9si8cqHt/xYIZs2LJE/65E270abMsBi4xz96G35i3BFP5UaFON3f8yfA6u1KReflWRlLIyDN3yVpdoUvqb/91p1FSA2BSSo1tLz7WFic0HCRnFLCfvdNUALzThuh1QVeHNnxouN4xaPng= 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: David Howells wrote: > Now that ->sendpage() has been removed, MSG_SENDPAGE_NOTLAST can be cleaned > up. Things were converted to use MSG_MORE instead, but the protocol > sendpage stubs still convert MSG_SENDPAGE_NOTLAST to MSG_MORE, which is now > unnecessary. > > Signed-off-by: David Howells > cc: "David S. Miller" > cc: Eric Dumazet > cc: Jakub Kicinski > cc: Paolo Abeni > cc: Jens Axboe > cc: Matthew Wilcox > cc: bpf@vger.kernel.org > cc: dccp@vger.kernel.org > cc: linux-afs@lists.infradead.org > cc: linux-arm-msm@vger.kernel.org > cc: linux-can@vger.kernel.org > cc: linux-crypto@vger.kernel.org > cc: linux-doc@vger.kernel.org > cc: linux-hams@vger.kernel.org > cc: linux-perf-users@vger.kernel.org > cc: linux-rdma@vger.kernel.org > cc: linux-sctp@vger.kernel.org > cc: linux-wpan@vger.kernel.org > cc: linux-x25@vger.kernel.org > cc: mptcp@lists.linux.dev > cc: netdev@vger.kernel.org > cc: rds-devel@oss.oracle.com > cc: tipc-discussion@lists.sourceforge.net > cc: virtualization@lists.linux-foundation.org > --- > include/linux/socket.h | 4 +--- > net/ipv4/tcp_bpf.c | 4 +++- > net/tls/tls_device.c | 3 +-- > net/tls/tls_main.c | 2 +- > net/tls/tls_sw.c | 2 +- > tools/perf/trace/beauty/include/linux/socket.h | 1 - > tools/perf/trace/beauty/msg_flags.c | 3 --- > 7 files changed, 7 insertions(+), 12 deletions(-) > > @@ -90,7 +90,9 @@ static int tcp_bpf_push(struct sock *sk, struct sk_msg *msg, u32 apply_bytes, > { > bool apply = apply_bytes; > struct scatterlist *sge; > - struct msghdr msghdr = { .msg_flags = flags | MSG_SPLICE_PAGES, }; > + struct msghdr msghdr = { > + .msg_flags = flags | MSG_SPLICE_PAGES | MSG_MORE, > + }; > struct page *page; > int size, ret = 0; > u32 off; Is it intentional to add MSG_MORE here in this patch? I do see that patch 3 removes this branch: @@ -111,9 +111,6 @@ static int tcp_bpf_push(struct sock *sk, struct sk_msg *msg, u32 apply_bytes, if (has_tx_ulp) msghdr.msg_flags |= MSG_SENDPAGE_NOPOLICY; - if (flags & MSG_SENDPAGE_NOTLAST) - msghdr.msg_flags |= MSG_MORE; -