From nobody Fri Sep 20 01:44:43 2024 Received: from szxga03-in.huawei.com (szxga03-in.huawei.com [45.249.212.189]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id DD9D215958D; Fri, 6 Sep 2024 07:43:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=45.249.212.189 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725608582; cv=none; b=RZwHSXYszrLvVJYzu1bTtUzplhvnDS77DHt7d2MVK5tLWo0qaK3K0WfsHC0RGqHJrd2g23AsqsYMKw3mcp0fn0NZiFp5kKakJYica50wNJ0YKYWHJz6C7jjdshU7BMMCqf38mOtZQig8JOhg/XgMqWd+AhIqJeFFx0ornP1xrwU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1725608582; c=relaxed/simple; bh=kQfD/jZBGpPXapWUu9MKRZmjW0FDIN7FETm6sxPdfvU=; h=From:To:CC:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=N0IEOfLFxHv6scivN3/Qq4K1fst8oR31ZKhsRCoICLMZ+VHrGpqAWcF5XJDbUXjbUzobpvNthzrjb7xDDsmqyItWfF+O6E2dCR0zBEyE95/yhiO6PP+/dNZ2Ga05iLrZscrBeTXGdVzR0WBpKPy1kXaJvQ3fXDcqaog93/pkAgo= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com; spf=pass smtp.mailfrom=huawei.com; arc=none smtp.client-ip=45.249.212.189 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=huawei.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=huawei.com Received: from mail.maildlp.com (unknown [172.19.162.254]) by szxga03-in.huawei.com (SkyGuard) with ESMTP id 4X0SkX6VGCz69Wd; Fri, 6 Sep 2024 15:37:56 +0800 (CST) Received: from dggpemf200006.china.huawei.com (unknown [7.185.36.61]) by mail.maildlp.com (Postfix) with ESMTPS id 748D91800FE; Fri, 6 Sep 2024 15:42:56 +0800 (CST) Received: from localhost.localdomain (10.90.30.45) by dggpemf200006.china.huawei.com (7.185.36.61) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.1544.11; Fri, 6 Sep 2024 15:42:56 +0800 From: Yunsheng Lin To: , , CC: , , Yunsheng Lin , Alexander Duyck , Eric Dumazet , David Ahern Subject: [PATCH net-next v18 09/14] net: rename skb_copy_to_page_nocache() helper Date: Fri, 6 Sep 2024 15:36:41 +0800 Message-ID: <20240906073646.2930809-10-linyunsheng@huawei.com> X-Mailer: git-send-email 2.30.0 In-Reply-To: <20240906073646.2930809-1-linyunsheng@huawei.com> References: <20240906073646.2930809-1-linyunsheng@huawei.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-ClientProxiedBy: dggems705-chm.china.huawei.com (10.3.19.182) To dggpemf200006.china.huawei.com (7.185.36.61) Content-Type: text/plain; charset="utf-8" Rename skb_copy_to_page_nocache() to skb_copy_to_va_nocache() to avoid calling virt_to_page() as we are about to pass virtual address directly. CC: Alexander Duyck Signed-off-by: Yunsheng Lin --- include/net/sock.h | 10 ++++------ net/ipv4/tcp.c | 7 +++---- net/kcm/kcmsock.c | 7 +++---- 3 files changed, 10 insertions(+), 14 deletions(-) diff --git a/include/net/sock.h b/include/net/sock.h index f51d61fab059..5adcc77de422 100644 --- a/include/net/sock.h +++ b/include/net/sock.h @@ -2183,15 +2183,13 @@ static inline int skb_add_data_nocache(struct sock = *sk, struct sk_buff *skb, return err; } =20 -static inline int skb_copy_to_page_nocache(struct sock *sk, struct iov_ite= r *from, - struct sk_buff *skb, - struct page *page, - int off, int copy) +static inline int skb_copy_to_va_nocache(struct sock *sk, struct iov_iter = *from, + struct sk_buff *skb, char *va, + int copy) { int err; =20 - err =3D skb_do_copy_data_nocache(sk, skb, from, page_address(page) + off, - copy, skb->len); + err =3D skb_do_copy_data_nocache(sk, skb, from, va, copy, skb->len); if (err) return err; =20 diff --git a/net/ipv4/tcp.c b/net/ipv4/tcp.c index 8a5680b4e786..8bf8ce656b0a 100644 --- a/net/ipv4/tcp.c +++ b/net/ipv4/tcp.c @@ -1215,10 +1215,9 @@ int tcp_sendmsg_locked(struct sock *sk, struct msghd= r *msg, size_t size) if (!copy) goto wait_for_space; =20 - err =3D skb_copy_to_page_nocache(sk, &msg->msg_iter, skb, - pfrag->page, - pfrag->offset, - copy); + err =3D skb_copy_to_va_nocache(sk, &msg->msg_iter, skb, + page_address(pfrag->page) + + pfrag->offset, copy); if (err) goto do_error; =20 diff --git a/net/kcm/kcmsock.c b/net/kcm/kcmsock.c index d4118c796290..f4462cf88ed5 100644 --- a/net/kcm/kcmsock.c +++ b/net/kcm/kcmsock.c @@ -856,10 +856,9 @@ static int kcm_sendmsg(struct socket *sock, struct msg= hdr *msg, size_t len) if (!sk_wmem_schedule(sk, copy)) goto wait_for_memory; =20 - err =3D skb_copy_to_page_nocache(sk, &msg->msg_iter, skb, - pfrag->page, - pfrag->offset, - copy); + err =3D skb_copy_to_va_nocache(sk, &msg->msg_iter, skb, + page_address(pfrag->page) + + pfrag->offset, copy); if (err) goto out_error; =20 --=20 2.33.0