From patchwork Wed Oct 19 08:35:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 5010 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:4ac7:0:0:0:0:0 with SMTP id y7csp244389wrs; Wed, 19 Oct 2022 03:32:55 -0700 (PDT) X-Google-Smtp-Source: AMsMyM58PEjQARq6JAwrMZz53ZugK3cHU3e0e2dzc1DabzqdKn6RA2xyI0WP2nNl/dWaexLrBPeF X-Received: by 2002:a05:6402:34cb:b0:45d:197e:718c with SMTP id w11-20020a05640234cb00b0045d197e718cmr6827260edc.365.1666175575018; Wed, 19 Oct 2022 03:32:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666175575; cv=none; d=google.com; s=arc-20160816; b=Rr2DikCUAeety3Eqk6DQLel5/KvdkXnhktIjWFck/4UZAxqEM8nVplkjR86kuKXVed megU0WQQ4SkMpeUlmSzRnI8wyOIcPFJBNfaK1nXKaUevbGVrXY3WUGaDixSciCgu6wbf LKbOTxqhGMIpEifmPkKISYeqbyLgCRG+dmBkaU5okXgq4MW5z67V3CuEC3gw6C4eHXrp zIrrf/JM3e4m04krY3W1OGXUxtQVYeeYTHNrLgAHYANbvlVZvwjIEaawZeOzlNnbZNfz 5M51dsmWdO3d8F4kt5bfVanpGOfRrfstE1wNyo/aQj0iYfItTaF7Otj8GK9WBdVONbcY njAw== 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=ktJ4zAAK/cfIWm6n1DWVtICS50QIO/aiRTBa76vGKIE=; b=VPsKABHduqfMl/yV7MXsyCZiJVPUfCNbSs8x1+QaM4NRExMa7oF2bNRTNV+3lKHZK0 /llHxPEPny918fLfIiRP+soH1v2YudIFChXeXNUiFn46RvVS8laojLYcsuTpHEsfNqOv oHLVlLAhsPM8mCRQXBx8RfhF39Ki6RX0xmq6W1P8UFhd4iV8Z1TL5SNSArzHRxWcgzSz buwkqYPRliiWz2IAaIMR6xViOwqVRQeDfP3oCA5vVB9i6bwcgAb4oIPs/NHmWDVmoBwR 1qy1j8lowiyr6pgrGf3xbYq8mQL7StCQBMfRD4h98vaBU8VCiPVzTqg7BvyxCrGPidHB WlCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=d6u9feQT; 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 pk21-20020a170906d7b500b0078db6f488c2si12529394ejb.56.2022.10.19.03.32.19; Wed, 19 Oct 2022 03:32:55 -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=d6u9feQT; 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 S233369AbiJSKIR (ORCPT + 99 others); Wed, 19 Oct 2022 06:08:17 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44614 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233537AbiJSKH5 (ORCPT ); Wed, 19 Oct 2022 06:07:57 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id EA1A11372B0; Wed, 19 Oct 2022 02:46:21 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id C8A9961811; Wed, 19 Oct 2022 09:15:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E09EFC433C1; Wed, 19 Oct 2022 09:15:45 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666170946; bh=YspMoVNdhe0Amkm/NqCNpfJEbXRl1gsIsi9AdqNL9yg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=d6u9feQTMacoh6lmzv3TyozymyicoEpbQxAWRFCb0vDDxXbdU9AZtZgCGP1VTYkpI UGsuxBNux6Iykpn6nFC2FfrZVHhAu/anCY+B4thyLhx57BdCrwj5XJ50XAFTMp2voQ SghRGCiWIrNS909FILA9RJJ5a7E9iVWP+Y5NoADE= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Greg Kroah-Hartman , Pavel Begunkov , Jens Axboe Subject: [PATCH 6.0 845/862] io_uring/net: rename io_sendzc() Date: Wed, 19 Oct 2022 10:35:32 +0200 Message-Id: <20221019083327.225706381@linuxfoundation.org> X-Mailer: git-send-email 2.38.0 In-Reply-To: <20221019083249.951566199@linuxfoundation.org> References: <20221019083249.951566199@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.4 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 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747111719377698557?= X-GMAIL-MSGID: =?utf-8?q?1747111719377698557?= From: Pavel Begunkov [ upstream commit b0e9b5517eb12fa80c72e205fe28534c2e2f39b9 ] Simple renaming of io_sendzc*() functions in preparatio to adding a zerocopy sendmsg variant. Signed-off-by: Pavel Begunkov Link: https://lore.kernel.org/r/265af46829e6076dd220011b1858dc3151969226.1663668091.git.asml.silence@gmail.com Signed-off-by: Jens Axboe Signed-off-by: Greg Kroah-Hartman --- io_uring/net.c | 6 +++--- io_uring/net.h | 6 +++--- io_uring/opdef.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) --- a/io_uring/net.c +++ b/io_uring/net.c @@ -875,7 +875,7 @@ out_free: return ret; } -void io_sendzc_cleanup(struct io_kiocb *req) +void io_send_zc_cleanup(struct io_kiocb *req) { struct io_sr_msg *zc = io_kiocb_to_cmd(req, struct io_sr_msg); @@ -884,7 +884,7 @@ void io_sendzc_cleanup(struct io_kiocb * zc->notif = NULL; } -int io_sendzc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) +int io_send_zc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe) { struct io_sr_msg *zc = io_kiocb_to_cmd(req, struct io_sr_msg); struct io_ring_ctx *ctx = req->ctx; @@ -989,7 +989,7 @@ static int io_sg_from_iter(struct sock * return ret; } -int io_sendzc(struct io_kiocb *req, unsigned int issue_flags) +int io_send_zc(struct io_kiocb *req, unsigned int issue_flags) { struct sockaddr_storage __address, *addr = NULL; struct io_sr_msg *zc = io_kiocb_to_cmd(req, struct io_sr_msg); --- a/io_uring/net.h +++ b/io_uring/net.h @@ -55,9 +55,9 @@ int io_connect_prep_async(struct io_kioc int io_connect_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe); int io_connect(struct io_kiocb *req, unsigned int issue_flags); -int io_sendzc(struct io_kiocb *req, unsigned int issue_flags); -int io_sendzc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe); -void io_sendzc_cleanup(struct io_kiocb *req); +int io_send_zc(struct io_kiocb *req, unsigned int issue_flags); +int io_send_zc_prep(struct io_kiocb *req, const struct io_uring_sqe *sqe); +void io_send_zc_cleanup(struct io_kiocb *req); void io_send_zc_fail(struct io_kiocb *req); void io_netmsg_cache_free(struct io_cache_entry *entry); --- a/io_uring/opdef.c +++ b/io_uring/opdef.c @@ -490,10 +490,10 @@ const struct io_op_def io_op_defs[] = { .manual_alloc = 1, #if defined(CONFIG_NET) .async_size = sizeof(struct io_async_msghdr), - .prep = io_sendzc_prep, - .issue = io_sendzc, + .prep = io_send_zc_prep, + .issue = io_send_zc, .prep_async = io_sendzc_prep_async, - .cleanup = io_sendzc_cleanup, + .cleanup = io_send_zc_cleanup, .fail = io_send_zc_fail, #else .prep = io_eopnotsupp_prep,