From nobody Mon Feb 9 00:54:40 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 E946523AE82 for ; Mon, 7 Apr 2025 09:15:54 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744017356; cv=none; b=tagI/D/uP05616mJVFSZybjtqWVCgDdyHrpfJftZb610ZmYQLsScgeyRQIYIbhm3BfJonwOd4tfXKxdJMxzRYoBifsoFEnHD4fi3Pclx3+bTpOioQKgD7TGL6Y5kGaXSoBHTMXvv2L3+JZY1h6sR0EQJRcF4KjuhdJ1gW6iGe60= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1744017356; c=relaxed/simple; bh=QYWsfxBVikh5WerGt90q9+bKyDEVYRtZkzdK9y81n/M=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=QBvcWZCaQEAktPqFw4wW5LHzk4W/R63EZ00DMNgUgTDKoDySZy27vPRp9AzKwJt4ZOipOqJ96WABlCJhAwwsXZ9oP/LlHkrX2CePrTY2RbouCqaXEKGC6wUHLQVmGWT14mSdfwhnn/KZYOGVgjXLnpL5qZzs+3wfpmFKD70DSfQ= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=SqjoJaRB; arc=none smtp.client-ip=170.10.129.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=quarantine dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="SqjoJaRB" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1744017353; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=GUQy5ty6t+S6SeJsp7bU9IOXf8dfem87dqctFS0XKDY=; b=SqjoJaRBA6YXExitWKMheFLOegCupsxFblFffPZTaprRVdjF7EDrom8u0XehFYwkJ4im/R uZmTKUIzzNAXQiGCeKtEISCveNe+33//5r8RTuT6o2f1qSymXrjLavv82uM0SgLWVqJkE0 TCrHDTTU8CiaAdRDJy0hKFTyXAIl3A8= Received: from mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-369-BtJFQs9jNemdYnRkVC_jSA-1; Mon, 07 Apr 2025 05:15:50 -0400 X-MC-Unique: BtJFQs9jNemdYnRkVC_jSA-1 X-Mimecast-MFC-AGG-ID: BtJFQs9jNemdYnRkVC_jSA_1744017349 Received: from mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.93]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-01.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id D80D519560BD; Mon, 7 Apr 2025 09:15:48 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.40]) by mx-prod-int-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 7B6A41828AA8; Mon, 7 Apr 2025 09:15:45 +0000 (UTC) From: David Howells To: netdev@vger.kernel.org Cc: David Howells , Marc Dionne , Jakub Kicinski , "David S. Miller" , Eric Dumazet , Paolo Abeni , Simon Horman , Christian Brauner , Chuck Lever , linux-afs@lists.infradead.org, openafs-devel@openafs.org, linux-kernel@vger.kernel.org Subject: [PATCH net-next 09/12] rxrpc: Display security params in the afs_cb_call tracepoint Date: Mon, 7 Apr 2025 10:14:40 +0100 Message-ID: <20250407091451.1174056-10-dhowells@redhat.com> In-Reply-To: <20250407091451.1174056-1-dhowells@redhat.com> References: <20250407091451.1174056-1-dhowells@redhat.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-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.93 Content-Type: text/plain; charset="utf-8" Make the afs_cb_call tracepoint display some security parameters to make debugging easier. Signed-off-by: David Howells cc: Marc Dionne cc: "David S. Miller" cc: Eric Dumazet cc: Jakub Kicinski cc: Paolo Abeni cc: Simon Horman cc: linux-afs@lists.infradead.org cc: netdev@vger.kernel.org --- fs/afs/internal.h | 2 ++ fs/afs/rxrpc.c | 4 ++++ include/net/af_rxrpc.h | 2 ++ include/trace/events/afs.h | 11 +++++++++-- net/rxrpc/ar-internal.h | 1 + net/rxrpc/call_object.c | 18 ++++++++++++++++++ net/rxrpc/rxgk.c | 2 ++ 7 files changed, 38 insertions(+), 2 deletions(-) diff --git a/fs/afs/internal.h b/fs/afs/internal.h index b3612b700c6a..178804817efb 100644 --- a/fs/afs/internal.h +++ b/fs/afs/internal.h @@ -176,8 +176,10 @@ struct afs_call { bool intr; /* T if interruptible */ bool unmarshalling_error; /* T if an unmarshalling error occurred */ bool responded; /* Got a response from the call (may be abort) */ + u8 security_ix; /* Security class */ u16 service_id; /* Actual service ID (after upgrade) */ unsigned int debug_id; /* Trace ID */ + u32 enctype; /* Security encoding type */ u32 operation_ID; /* operation ID for an incoming call */ u32 count; /* count for use in unmarshalling */ union { /* place to extract temporary data */ diff --git a/fs/afs/rxrpc.c b/fs/afs/rxrpc.c index 212af2aa85bf..00b3bc087f61 100644 --- a/fs/afs/rxrpc.c +++ b/fs/afs/rxrpc.c @@ -813,6 +813,10 @@ static int afs_deliver_cm_op_id(struct afs_call *call) if (!afs_cm_incoming_call(call)) return -ENOTSUPP; =20 + call->security_ix =3D rxrpc_kernel_query_call_security(call->rxcall, + &call->service_id, + &call->enctype); + trace_afs_cb_call(call); call->work.func =3D call->type->work; =20 diff --git a/include/net/af_rxrpc.h b/include/net/af_rxrpc.h index 0b209f703ffc..f15341594cc8 100644 --- a/include/net/af_rxrpc.h +++ b/include/net/af_rxrpc.h @@ -112,5 +112,7 @@ int rxkad_kernel_respond_to_challenge(struct sk_buff *c= hallenge); u32 rxgk_kernel_query_challenge(struct sk_buff *challenge); int rxgk_kernel_respond_to_challenge(struct sk_buff *challenge, struct krb5_buffer *appdata); +u8 rxrpc_kernel_query_call_security(struct rxrpc_call *call, + u16 *_service_id, u32 *_enctype); =20 #endif /* _NET_RXRPC_H */ diff --git a/include/trace/events/afs.h b/include/trace/events/afs.h index 8857f5ea77d4..7f83d242c8e9 100644 --- a/include/trace/events/afs.h +++ b/include/trace/events/afs.h @@ -663,19 +663,26 @@ TRACE_EVENT(afs_cb_call, __field(unsigned int, call) __field(u32, op) __field(u16, service_id) + __field(u8, security_ix) + __field(u32, enctype) ), =20 TP_fast_assign( __entry->call =3D call->debug_id; __entry->op =3D call->operation_ID; __entry->service_id =3D call->service_id; + __entry->security_ix =3D call->security_ix; + __entry->enctype =3D call->enctype; ), =20 - TP_printk("c=3D%08x %s", + TP_printk("c=3D%08x %s sv=3D%u sx=3D%u en=3D%u", __entry->call, __entry->service_id =3D=3D 2501 ? __print_symbolic(__entry->op, yfs_cm_operations) : - __print_symbolic(__entry->op, afs_cm_operations)) + __print_symbolic(__entry->op, afs_cm_operations), + __entry->service_id, + __entry->security_ix, + __entry->enctype) ); =20 TRACE_EVENT(afs_call, diff --git a/net/rxrpc/ar-internal.h b/net/rxrpc/ar-internal.h index d23ea4710cb2..767aed319fca 100644 --- a/net/rxrpc/ar-internal.h +++ b/net/rxrpc/ar-internal.h @@ -740,6 +740,7 @@ struct rxrpc_call { u32 call_id; /* call ID on connection */ u32 cid; /* connection ID plus channel index */ u32 security_level; /* Security level selected */ + u32 security_enctype; /* Security-specific encoding type (or 0) */ int debug_id; /* debug ID for printks */ unsigned short rx_pkt_offset; /* Current recvmsg packet offset */ unsigned short rx_pkt_len; /* Current recvmsg packet len */ diff --git a/net/rxrpc/call_object.c b/net/rxrpc/call_object.c index a4fedf639396..dce4c32c50ee 100644 --- a/net/rxrpc/call_object.c +++ b/net/rxrpc/call_object.c @@ -760,3 +760,21 @@ void rxrpc_destroy_all_calls(struct rxrpc_net *rxnet) atomic_dec(&rxnet->nr_calls); wait_var_event(&rxnet->nr_calls, !atomic_read(&rxnet->nr_calls)); } + +/** + * rxrpc_kernel_query_call_security - Query call's security parameters + * @call: The call to query + * @_service_id: Where to return the service ID + * @_enctype: Where to return the "encoding type" + * + * This queries the security parameters of a call, setting *@_service_id a= nd + * *@_enctype and returning the security class. + */ +u8 rxrpc_kernel_query_call_security(struct rxrpc_call *call, + u16 *_service_id, u32 *_enctype) +{ + *_service_id =3D call->dest_srx.srx_service; + *_enctype =3D call->security_enctype; + return call->security_ix; +} +EXPORT_SYMBOL(rxrpc_kernel_query_call_security); diff --git a/net/rxrpc/rxgk.c b/net/rxrpc/rxgk.c index 9b72894977ee..825430edaf0c 100644 --- a/net/rxrpc/rxgk.c +++ b/net/rxrpc/rxgk.c @@ -443,6 +443,7 @@ static int rxgk_secure_packet(struct rxrpc_call *call, = struct rxrpc_txbuf *txb) if (ret < 0) return ret; =20 + call->security_enctype =3D gk->krb5->etype; txb->cksum =3D htons(gk->key_number); =20 switch (call->conn->security_level) { @@ -590,6 +591,7 @@ static int rxgk_verify_packet(struct rxrpc_call *call, = struct sk_buff *skb) } } =20 + call->security_enctype =3D gk->krb5->etype; switch (call->conn->security_level) { case RXRPC_SECURITY_PLAIN: return 0;