From patchwork Fri Jul 21 15:59:06 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 124069 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp434337vqg; Fri, 21 Jul 2023 13:00:01 -0700 (PDT) X-Google-Smtp-Source: APBJJlHO46u9GjDWOuLfIa3Ea6mKj8LFU9cPN8A8//AGnK1p0yBFqNRT8ZcUjwe4zH+8vCgaw73X X-Received: by 2002:a05:6358:341f:b0:134:d559:259a with SMTP id h31-20020a056358341f00b00134d559259amr899528rwd.17.1689969601277; Fri, 21 Jul 2023 13:00:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689969601; cv=none; d=google.com; s=arc-20160816; b=GPqcU1dqEaZArZSwReM+kYNyEyshJGkVAyE2hn3iavEzzeX66QBlf3dO9LiVkibzFj zYkfUMTlwQmxuxUyVEJZBpL76vuSFFtMYujRAbTN2C6VpMXsDfPF69wBr1U6XN5VD/WR UMnLGV6Pj2jIKDGsV1oUVVK50zuQXo145PdkDTCF4HO69wzt2XA7k1W/6ANCIDt33LRe bENGgNqf9qJpkylUtaWLtGJrGepFww280l220Up6eBC4TvYItLV79QhLjjjV4mYmjEZY jjrNjpaoLo7hw5tSzsZhtDuzchlMdcAaxfo8eD5mYm/GNbORcBPNExrCQozexNAz0LVf tH3w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=JUVnotWzUWn9Z5ERl1LnFrFL0s98B29qtHLZMT5PqXM=; fh=Le4f2H40BCv36sKAJBmtCaG5HifXt4UBD6RscRSFfuE=; b=mP8NEDySxQ5TS2HOWW0weByd369CaLr/r5szoAn2YUaGCAZYqgtrAy8/DKxnbnOepr 60igB9p14a685xnESMigs+Jh9UqoyvL7zHhwEOuAhrthzqXYs4LTVQCbm8j2ahNrdQbg d10vQ9zhWqjOVPXI2Dcy/kBmU8dFIFnZA9gF2YVbF1T9DpgUdFqbYCUfbc1kfb2eKhi7 8wW1rPnntshrsZ7dGjECg4hSAnJN6C/sDUsvIrFy+ayYJtl47RUQSP4O7JbTDp4J7HLW /tke2PnMJSCRzh9jjVsnRmlGp5Br8qgNXG+X5k9STYEDHC5xa2Cl7mJXYFxTyvvpKgF6 eXhQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=VaTfxity; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id bv2-20020a632e02000000b0055bdec69c2fsi3572143pgb.260.2023.07.21.12.59.47; Fri, 21 Jul 2023 13:00:01 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=VaTfxity; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229656AbjGUSy1 (ORCPT + 99 others); Fri, 21 Jul 2023 14:54:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:47718 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229665AbjGUSy0 (ORCPT ); Fri, 21 Jul 2023 14:54:26 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 126BC30CA; Fri, 21 Jul 2023 11:54:25 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id A1E2061D82; Fri, 21 Jul 2023 18:54:24 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6487CC433C7; Fri, 21 Jul 2023 18:54:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1689965664; bh=zALDhhySGfyIUT3OC9NQC7z1i6nfr0e+GfPKJzNbJYM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=VaTfxityQRMjDTGuByuiUJrpEaUNks9HMVTBz6oIQvj6Gip8p8Hu7BLYhmbMoXzQb AqAZf2X/WwrGUAAP4xovtJZkCjoDOaiX2VBygkT++z3jV/H+qKiEOwnxWZPsIWB451 zK8oUzG62l7dZCeCNio/K+4z5IrCciep7NiJq+BE= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Daniel Borkmann , Christian Brauner , Stanislav Fomichev , Neil Horman , Marcelo Ricardo Leitner , Xin Long , linux-sctp@vger.kernel.org, linux-kernel@vger.kernel.org, netdev@vger.kernel.org, Alexander Mikhalitsyn , "David S. Miller" , Sasha Levin Subject: [PATCH 5.15 042/532] sctp: add bpf_bypass_getsockopt proto callback Date: Fri, 21 Jul 2023 17:59:06 +0200 Message-ID: <20230721160616.927524288@linuxfoundation.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230721160614.695323302@linuxfoundation.org> References: <20230721160614.695323302@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772061564535051447 X-GMAIL-MSGID: 1772061564535051447 From: Alexander Mikhalitsyn [ Upstream commit 2598619e012cee5273a2821441b9a051ad931249 ] Implement ->bpf_bypass_getsockopt proto callback and filter out SCTP_SOCKOPT_PEELOFF, SCTP_SOCKOPT_PEELOFF_FLAGS and SCTP_SOCKOPT_CONNECTX3 socket options from running eBPF hook on them. SCTP_SOCKOPT_PEELOFF and SCTP_SOCKOPT_PEELOFF_FLAGS options do fd_install(), and if BPF_CGROUP_RUN_PROG_GETSOCKOPT hook returns an error after success of the original handler sctp_getsockopt(...), userspace will receive an error from getsockopt syscall and will be not aware that fd was successfully installed into a fdtable. As pointed by Marcelo Ricardo Leitner it seems reasonable to skip bpf getsockopt hook for SCTP_SOCKOPT_CONNECTX3 sockopt too. Because internaly, it triggers connect() and if error is masked then userspace will be confused. This patch was born as a result of discussion around a new SCM_PIDFD interface: https://lore.kernel.org/all/20230413133355.350571-3-aleksandr.mikhalitsyn@canonical.com/ Fixes: 0d01da6afc54 ("bpf: implement getsockopt and setsockopt hooks") Cc: Daniel Borkmann Cc: Christian Brauner Cc: Stanislav Fomichev Cc: Neil Horman Cc: Marcelo Ricardo Leitner Cc: Xin Long Cc: linux-sctp@vger.kernel.org Cc: linux-kernel@vger.kernel.org Cc: netdev@vger.kernel.org Suggested-by: Stanislav Fomichev Acked-by: Stanislav Fomichev Signed-off-by: Alexander Mikhalitsyn Acked-by: Xin Long Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- net/sctp/socket.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/net/sctp/socket.c b/net/sctp/socket.c index 2bbc81ddb9e08..ed35d4a4c5253 100644 --- a/net/sctp/socket.c +++ b/net/sctp/socket.c @@ -8287,6 +8287,22 @@ static int sctp_getsockopt(struct sock *sk, int level, int optname, return retval; } +static bool sctp_bpf_bypass_getsockopt(int level, int optname) +{ + if (level == SOL_SCTP) { + switch (optname) { + case SCTP_SOCKOPT_PEELOFF: + case SCTP_SOCKOPT_PEELOFF_FLAGS: + case SCTP_SOCKOPT_CONNECTX3: + return true; + default: + return false; + } + } + + return false; +} + static int sctp_hash(struct sock *sk) { /* STUB */ @@ -9655,6 +9671,7 @@ struct proto sctp_prot = { .shutdown = sctp_shutdown, .setsockopt = sctp_setsockopt, .getsockopt = sctp_getsockopt, + .bpf_bypass_getsockopt = sctp_bpf_bypass_getsockopt, .sendmsg = sctp_sendmsg, .recvmsg = sctp_recvmsg, .bind = sctp_bind, @@ -9707,6 +9724,7 @@ struct proto sctpv6_prot = { .shutdown = sctp_shutdown, .setsockopt = sctp_setsockopt, .getsockopt = sctp_getsockopt, + .bpf_bypass_getsockopt = sctp_bpf_bypass_getsockopt, .sendmsg = sctp_sendmsg, .recvmsg = sctp_recvmsg, .bind = sctp_bind, From patchwork Fri Jul 21 16:04:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 124070 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9010:0:b0:3e4:2afc:c1 with SMTP id l16csp435939vqg; Fri, 21 Jul 2023 13:02:29 -0700 (PDT) X-Google-Smtp-Source: APBJJlEHQn2z1iyY22p+YyibczFxc8MJD+ajN3ZNH4qB4idapkYLXrBQZ6x4nExbNup5jN5xVbOO X-Received: by 2002:a05:6e02:1447:b0:348:8163:b6be with SMTP id p7-20020a056e02144700b003488163b6bemr897881ilo.30.1689969749526; Fri, 21 Jul 2023 13:02:29 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689969749; cv=none; d=google.com; s=arc-20160816; b=RLrtKSMcigs1ijqDtjQ/CkVLBP21XhZxtTGUkoNRhPvCVXx/Dk8iDsa2V5EqGVm7BZ 8CYMNXWAZM0hbedZ8EPHQPEX6ePVPiNVgYzWYL1CXLOv0f44gA6EQrEB58O2hQORElUm wX8axhiOcOlcwFz6qhAOiYoLBk9xCmlIGpQ54gTDnQInkuHiLRRvbPnKW1s050thnUGi g2qXIeJ8KcU9bqckxL1BcbpOQ4NHDmhjAOS7PNZqcTJYNOxyfxQrQzlLppERi2tTM6Kl 0hctnanqLbLEBXt+m5OVk3xavF6YGlZqd3rChDF5eqxBzhDFzUz5yiNfv4FBe1tNgYoN +GSQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=8cWQDCk5oBihzKMsM1kcX43ppMOe+0mg+i7edSzDEVg=; fh=lP7xFG8LMCk6E4eEHoDhWf7pUSclif8yeIbxz4oRH8Y=; b=qJJCT7+1M9rP4pdcF7Z4HlKbL5hdVLaq2st+Jse12Sbvcnvj42009ToFlGhJavewVk zi6/0M9pDYw3A8dzZvDSXFwQ9WbFanmrsb6IL/VyIuNrDUAhFRsfpG8sVg0nQWxtzJ0a DxQ2giH/nPFNCylndWEO+6gD5QpzT1Wio1yTgHZkpjrl5GgISCwTrlulO0xQbuqAFYfF OqAdggfKDBXJlqJ+3DfKsB00RURyKkb+q+Yj1mMsDy7BX+eNITRzjei8NLuKr02UiblB bmhfjlRlYSftx3cBIGX5dh2wHpwHSo2jS+Akutl150+hpL5fKymq6ERNLZ9CHaxko1+0 DOXw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=WoWUk4CL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id mz24-20020a17090b379800b00263419c5c00si3714076pjb.50.2023.07.21.13.02.00; Fri, 21 Jul 2023 13:02:29 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=WoWUk4CL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231793AbjGUTJW (ORCPT + 99 others); Fri, 21 Jul 2023 15:09:22 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:32838 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231782AbjGUTJU (ORCPT ); Fri, 21 Jul 2023 15:09:20 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5E85230E2; Fri, 21 Jul 2023 12:09:19 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id E294061D76; Fri, 21 Jul 2023 19:09:18 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id EDD18C433C8; Fri, 21 Jul 2023 19:09:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1689966558; bh=EdI7fGRw+9RtkPzgYW2VysuSJKvBTQQ/+BHVsl+k9Xg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=WoWUk4CLqfJ0XSbg8w8K7LF/xaYogSg6ZvfyINkJJX63ql/f8pEqZth2ym9HTeMVi h64f/LD22geBdEJ+RbZf3p5VGNBJr3yF5kRBnFa13plcdygLKL0ytgd0U+pcnt7oex u0CXNHREwaAcSiV7J+k19Zzr8R4s1OqhuBpPaFh0= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Pavel Begunkov , io-uring@vger.kernel.org, linux-kernel@vger.kernel.org, Andres Freund , Jens Axboe Subject: [PATCH 5.15 387/532] io_uring: Use io_schedule* in cqring wait Date: Fri, 21 Jul 2023 18:04:51 +0200 Message-ID: <20230721160635.467197216@linuxfoundation.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230721160614.695323302@linuxfoundation.org> References: <20230721160614.695323302@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-5.5 required=5.0 tests=BAYES_00,DATE_IN_PAST_03_06, DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF, RCVD_IN_DNSWL_HI,SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1772061719816520473 X-GMAIL-MSGID: 1772061719816520473 From: Andres Freund Commit 8a796565cec3601071cbbd27d6304e202019d014 upstream. I observed poor performance of io_uring compared to synchronous IO. That turns out to be caused by deeper CPU idle states entered with io_uring, due to io_uring using plain schedule(), whereas synchronous IO uses io_schedule(). The losses due to this are substantial. On my cascade lake workstation, t/io_uring from the fio repository e.g. yields regressions between 20% and 40% with the following command: ./t/io_uring -r 5 -X0 -d 1 -s 1 -c 1 -p 0 -S$use_sync -R 0 /mnt/t2/fio/write.0.0 This is repeatable with different filesystems, using raw block devices and using different block devices. Use io_schedule_prepare() / io_schedule_finish() in io_cqring_wait_schedule() to address the difference. After that using io_uring is on par or surpassing synchronous IO (using registered files etc makes it reliably win, but arguably is a less fair comparison). There are other calls to schedule() in io_uring/, but none immediately jump out to be similarly situated, so I did not touch them. Similarly, it's possible that mutex_lock_io() should be used, but it's not clear if there are cases where that matters. Cc: stable@vger.kernel.org # 5.10+ Cc: Pavel Begunkov Cc: io-uring@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Andres Freund Link: https://lore.kernel.org/r/20230707162007.194068-1-andres@anarazel.de [axboe: minor style fixup] Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- io_uring/io_uring.c | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) --- a/io_uring/io_uring.c +++ b/io_uring/io_uring.c @@ -7796,7 +7796,7 @@ static inline int io_cqring_wait_schedul struct io_wait_queue *iowq, ktime_t *timeout) { - int ret; + int token, ret; /* make sure we run task_work before checking for signals */ ret = io_run_task_work_sig(); @@ -7806,9 +7806,17 @@ static inline int io_cqring_wait_schedul if (test_bit(0, &ctx->check_cq_overflow)) return 1; + /* + * Use io_schedule_prepare/finish, so cpufreq can take into account + * that the task is waiting for IO - turns out to be important for low + * QD IO. + */ + token = io_schedule_prepare(); + ret = 1; if (!schedule_hrtimeout(timeout, HRTIMER_MODE_ABS)) - return -ETIME; - return 1; + ret = -ETIME; + io_schedule_finish(token); + return ret; } /*