From nobody Thu Apr 18 22:57:30 2024 Delivered-To: wpasupplicant.patchew@gmail.com Received: by 2002:a02:1d48:0:0:0:0:0 with SMTP id 69csp103062jaj; Thu, 9 Sep 2021 01:43:56 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzuO1IuHCO7TbFsPjEqRLZxva/58p0SFt+CD+M+Y2L5kNNB2JdH/XqF1eUSX4y/QNmCvdlV X-Received: by 2002:a17:90a:eb0d:: with SMTP id j13mr2202410pjz.163.1631177036620; Thu, 09 Sep 2021 01:43:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1631177036; cv=none; d=google.com; s=arc-20160816; b=czx6B7PK2hDxOQq8mbKxjqb+/wuQjl/n3nWUPBse2OfBXQXPqKviB0zsvlzQLLIU+s zDxhgk4fhoQEDAxDI09lwMw/dFAzIWJGd2sELPaX/ltMWlu4cp2fXiulpnNBPSh00aBx gq+ePPFNLKsx8vJJUojD7ug1RRe/K5slLxkN//yhpbRDSV4454oBibvqjdn8K8LGe2iV Sc+fh081MXuZGzOi0Zpme/x258+Au8XMiRttzKL/rcDIx4h5gxNmw/0wFIlLbGgr+SIl U8M0vf2jY/S1d9+AJ5o6ypd02kO2yEoVn0Qe0YD4IX8GcbaL/53P87gwNe3KP8HBgHTV n+DA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:message-id:date:subject:to:from :dkim-signature; bh=fhdHObIl/5jcg6wEl/b2TkEt4z4g+DrJwiD7nwZt32M=; b=cenqu8ydH2KSGFSui3mJubVpbppTPsdTWmGolMETmWt5CkMu8p2/up4Igx43zhDsyX iShm0zT1Yxck4WmuJECJmGoXnVwa5vknYIC4v4LzuBM0/7gwgMuQ00VF7fyhLIG7hfW7 MtUocOprJQMgqIeWE43v03t8PnPKTDCDShpHjbu+sTXmMR73O7C2IgZ3Th+KomOUMoa2 gOTvyAVKlACgdV8NJ88ACnPdyRmQVlzJfroS+CrzDlNjZKeBr2463jpODbTL9fXoVIO8 ZirnpZMuhvN1T3oR361O5ZC2dKmazEzMcDam1vmcDhZdfHFYgQSFER5Rvp6iPiHUWAfo wfJQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="Xv/nEvfk"; spf=pass (google.com: domain of mptcp+bounces-1889-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-1889-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from sjc.edge.kernel.org (sjc.edge.kernel.org. [2604:1380:1000:8100::1]) by mx.google.com with ESMTPS id lr17si1287643pjb.155.2021.09.09.01.43.56 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 09 Sep 2021 01:43:56 -0700 (PDT) Received-SPF: pass (google.com: domain of mptcp+bounces-1889-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) client-ip=2604:1380:1000:8100::1; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b="Xv/nEvfk"; spf=pass (google.com: domain of mptcp+bounces-1889-wpasupplicant.patchew=gmail.com@lists.linux.dev designates 2604:1380:1000:8100::1 as permitted sender) smtp.mailfrom="mptcp+bounces-1889-wpasupplicant.patchew=gmail.com@lists.linux.dev"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by sjc.edge.kernel.org (Postfix) with ESMTPS id C0EF03E0EDA for ; Thu, 9 Sep 2021 08:43:55 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 8B1B03FCD; Thu, 9 Sep 2021 08:43:54 +0000 (UTC) X-Original-To: mptcp@lists.linux.dev Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (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 B32C472 for ; Thu, 9 Sep 2021 08:43:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1631177031; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=fhdHObIl/5jcg6wEl/b2TkEt4z4g+DrJwiD7nwZt32M=; b=Xv/nEvfkz1OjSxQL55tX7qcGGg7lpuJKGqUOXsGGFpOIBTBe9Zd4qs81IxI9rquLH6nGt3 MAit6UtDUdD/hivubHzc7MXDcZBHm9EFYIezb3yneJaKWYWQTBagYYrD3WNLao5cky6QiG 0x0qqP+L/Nf6XZxDFItRWaVZMGr1cR0= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-270-bjbDlytWNsOuOXRRiAZgww-1; Thu, 09 Sep 2021 04:43:50 -0400 X-MC-Unique: bjbDlytWNsOuOXRRiAZgww-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 818931006AA0 for ; Thu, 9 Sep 2021 08:43:49 +0000 (UTC) Received: from gerbillo.redhat.com (unknown [10.39.194.242]) by smtp.corp.redhat.com (Postfix) with ESMTP id DEA2218FD2 for ; Thu, 9 Sep 2021 08:43:48 +0000 (UTC) From: Paolo Abeni To: mptcp@lists.linux.dev Subject: [PATCH mptcp-next] chtls: rename skb_entail() to chtls_skb_entail() Date: Thu, 9 Sep 2021 10:43:41 +0200 Message-Id: Precedence: bulk X-Mailing-List: mptcp@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=pabeni@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset="utf-8" The next patch will expose the core TCP helper with the same name. It looks like we can't trivially re-use it in chtls, so remame the driver specific's one to avoid name conflicts. Signed-off-by: Paolo Abeni Acked-by: Mat Martineau --- notes: - this should land before "tcp: expose the tcp_mark_push() and skb_entail() helpers" - just build tested, I lack the relevant H/W to do anything better - we need to CC the appropriate chelsio maintainer when submitting this patch upstream - I did not add the reported-by buildbot tag. as there will no issue with the patch applied in order, but I guess it can be added, too --- .../net/ethernet/chelsio/inline_crypto/chtls/chtls.h | 2 +- .../ethernet/chelsio/inline_crypto/chtls/chtls_cm.c | 2 +- .../ethernet/chelsio/inline_crypto/chtls/chtls_io.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls.h b/dri= vers/net/ethernet/chelsio/inline_crypto/chtls/chtls.h index 9e2378013642..4b57e58845b0 100644 --- a/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls.h +++ b/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls.h @@ -580,7 +580,7 @@ void chtls_set_tcb_field_rpl_skb(struct sock *sk, u16 w= ord, int through_l2t); int chtls_setkey(struct chtls_sock *csk, u32 keylen, u32 mode, int cipher_= type); void chtls_set_quiesce_ctrl(struct sock *sk, int val); -void skb_entail(struct sock *sk, struct sk_buff *skb, int flags); +void chtls_skb_entail(struct sock *sk, struct sk_buff *skb, int flags); unsigned int keyid_to_addr(int start_addr, int keyid); void free_tls_keyid(struct sock *sk); #endif diff --git a/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c b/= drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c index bcad69c48074..dfa2bfc9638e 100644 --- a/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c +++ b/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_cm.c @@ -317,7 +317,7 @@ static void chtls_close_conn(struct sock *sk) OPCODE_TID(req) =3D htonl(MK_OPCODE_TID(CPL_CLOSE_CON_REQ, tid)); =20 tcp_uncork(sk); - skb_entail(sk, skb, ULPCB_FLAG_NO_HDR | ULPCB_FLAG_NO_APPEND); + chtls_skb_entail(sk, skb, ULPCB_FLAG_NO_HDR | ULPCB_FLAG_NO_APPEND); if (sk->sk_state !=3D TCP_SYN_SENT) chtls_push_frames(csk, 1); } diff --git a/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_io.c b/= drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_io.c index c320cc8ca68d..05cf45098462 100644 --- a/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_io.c +++ b/drivers/net/ethernet/chelsio/inline_crypto/chtls/chtls_io.c @@ -119,8 +119,8 @@ static int send_flowc_wr(struct sock *sk, struct fw_flo= wc_wr *flowc, if (!skb) return -ENOMEM; =20 - skb_entail(sk, skb, - ULPCB_FLAG_NO_HDR | ULPCB_FLAG_NO_APPEND); + chtls_skb_entail(sk, skb, + ULPCB_FLAG_NO_HDR | ULPCB_FLAG_NO_APPEND); return 0; } =20 @@ -816,7 +816,7 @@ static int select_size(struct sock *sk, int io_len, int= flags, int len) return io_len; } =20 -void skb_entail(struct sock *sk, struct sk_buff *skb, int flags) +void chtls_skb_entail(struct sock *sk, struct sk_buff *skb, int flags) { struct chtls_sock *csk =3D rcu_dereference_sk_user_data(sk); struct tcp_sock *tp =3D tcp_sk(sk); @@ -840,7 +840,7 @@ static struct sk_buff *get_tx_skb(struct sock *sk, int = size) skb =3D alloc_skb(size + TX_HEADER_LEN, sk->sk_allocation); if (likely(skb)) { skb_reserve(skb, TX_HEADER_LEN); - skb_entail(sk, skb, ULPCB_FLAG_NEED_HDR); + chtls_skb_entail(sk, skb, ULPCB_FLAG_NEED_HDR); skb_reset_transport_header(skb); } return skb; @@ -857,7 +857,7 @@ static struct sk_buff *get_record_skb(struct sock *sk, = int size, bool zcopy) if (likely(skb)) { skb_reserve(skb, (TX_TLSHDR_LEN + KEY_ON_MEM_SZ + max_ivs_size(sk, size))); - skb_entail(sk, skb, ULPCB_FLAG_NEED_HDR); + chtls_skb_entail(sk, skb, ULPCB_FLAG_NEED_HDR); skb_reset_transport_header(skb); ULP_SKB_CB(skb)->ulp.tls.ofld =3D 1; ULP_SKB_CB(skb)->ulp.tls.type =3D csk->tlshws.type; --=20 2.26.3