Skip to content

DLPX-95197 NFS_OPS analytics collector not working #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
sebroy merged 1 commit into from
Aug 27, 2025
Merged

DLPX-95197 NFS_OPS analytics collector not working #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 30 additions & 28 deletions bpf/estat/nfs.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,15 @@
* SPDX-License-Identifier: GPL-2.0-or-later
*/

struct bpf_wq {
__u64 __opaque[2];
} __attribute__((aligned(8)));

#include <uapi/linux/ptrace.h>
#include <linux/bpf_common.h>
#include <uapi/linux/bpf.h>
#include <linux/sunrpc/svc.h>
#include <linux/nfs4.h>


// nfsd4 definitions from fs/nfsd/xdr4.h
Expand All @@ -30,32 +35,29 @@ typedef struct {
stateid_opaque_t si_opaque;
} stateid_t;

typedef struct {
stateid_t rd_stateid; /* request */
u64 rd_offset; /* request */
u32 rd_length; /* request */
int rd_vlen;
struct file *rd_filp;
bool rd_tmp_file;

void *rd_rqstp; /* response */
void *rd_fhp; /* response */
} nfsd4_read;

#define NFS4_VERIFIER_SIZE 8
typedef struct { char data[NFS4_VERIFIER_SIZE]; } nfs4_verifier;

typedef struct {
stateid_t wr_stateid; /* request */
u64 wr_offset; /* request */
u32 wr_stable_how; /* request */
u32 wr_buflen; /* request */
struct kvec wr_head;
struct page **wr_pagelist; /* request */
u32 wr_bytes_written; /* response */
u32 wr_how_written; /* response */
nfs4_verifier wr_verifier; /* response */
} nfsd4_write;
struct nfsd4_read {
stateid_t rd_stateid; /* request */
u64 rd_offset; /* request */
u32 rd_length; /* request */
int rd_vlen;
struct nfsd_file *rd_nf;

struct svc_rqst *rd_rqstp; /* response */
struct svc_fh *rd_fhp; /* response */
u32 rd_eof; /* response */
};

struct nfsd4_write {
stateid_t wr_stateid; /* request */
u64 wr_offset; /* request */
u32 wr_stable_how; /* request */
u32 wr_buflen; /* request */
struct xdr_buf wr_payload; /* request */

u32 wr_bytes_written; /* response */
u32 wr_how_written; /* response */
nfs4_verifier wr_verifier; /* response */
};

// Definitions for this script
#define READ_STR "read"
Expand Down Expand Up @@ -131,7 +133,7 @@ nfsd3_write_start(struct pt_regs *ctx, struct svc_rqst *rqstp, void *fhp,
// @@ kprobe|nfsd4_read|nfsd4_read_start
int
nfsd4_read_start(struct pt_regs *ctx, struct svc_rqst *rqstp, void *cstate,
nfsd4_read *nfs_read)
struct nfsd4_read *nfs_read)
{
u32 pid = bpf_get_current_pid_tgid();
nfs_data_t data = {};
Expand All @@ -148,7 +150,7 @@ nfsd4_read_start(struct pt_regs *ctx, struct svc_rqst *rqstp, void *cstate,
// @@ kprobe|nfsd4_write|nfsd4_write_start
int
nfsd4_write_start(struct pt_regs *ctx, struct svc_rqst *rqstp, void *cstate,
nfsd4_write *nfs_write)
struct nfsd4_write *nfs_write)
{
u32 pid = bpf_get_current_pid_tgid();
nfs_data_t data = {};
Expand Down
72 changes: 38 additions & 34 deletions bpf/stbtrace/nfs.st
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,16 @@ from bcchelper import BCCHelper # noqa: E402
# BPF txg program
bpf_text = '#include "' + base_dir + 'lib/bcc_helper.h' + '"\n'
bpf_text += """

struct bpf_wq {
__u64 __opaque[2];
} __attribute__((aligned(8)));

#include <uapi/linux/ptrace.h>
#include <linux/bpf_common.h>
#include <uapi/linux/bpf.h>
#include <linux/sunrpc/svc.h>
#include <linux/nfs4.h>


// nfsd4 definitions from fs/nfsd/xdr4.h
Expand All @@ -35,45 +41,43 @@ bpf_text += """
#define bool int

typedef struct {
u32 cl_boot;
u32 cl_id;
u32 cl_boot;
u32 cl_id;
} clientid_t;

typedef struct {
clientid_t so_clid;
u32 so_id;
clientid_t so_clid;
u32 so_id;
} stateid_opaque_t;

typedef struct {
u32 si_generation;
stateid_opaque_t si_opaque;
u32 si_generation;
stateid_opaque_t si_opaque;
} stateid_t;

typedef struct {
stateid_t rd_stateid; /* request */
u64 rd_offset; /* request */
u32 rd_length; /* request */
int rd_vlen;
struct file *rd_filp;
bool rd_tmp_file;
void *rd_rqstp; /* response */
void *rd_fhp; /* response */
} nfsd4_read;

#define NFS4_VERIFIER_SIZE 8
typedef struct { char data[NFS4_VERIFIER_SIZE]; } nfs4_verifier;

typedef struct {
stateid_t wr_stateid; /* request */
u64 wr_offset; /* request */
u32 wr_stable_how; /* request */
u32 wr_buflen; /* request */
struct kvec wr_head;
struct page ** wr_pagelist; /* request */
u32 wr_bytes_written; /* response */
u32 wr_how_written; /* response */
nfs4_verifier wr_verifier; /* response */
} nfsd4_write;
struct nfsd4_read {
stateid_t rd_stateid; /* request */
u64 rd_offset; /* request */
u32 rd_length; /* request */
int rd_vlen;
struct nfsd_file *rd_nf;

struct svc_rqst *rd_rqstp; /* response */
struct svc_fh *rd_fhp; /* response */
u32 rd_eof; /* response */
};

struct nfsd4_write {
stateid_t wr_stateid; /* request */
u64 wr_offset; /* request */
u32 wr_stable_how; /* request */
u32 wr_buflen; /* request */
struct xdr_buf wr_payload; /* request */

u32 wr_bytes_written; /* response */
u32 wr_how_written; /* response */
nfs4_verifier wr_verifier; /* response */
};

// Definitions for this script
#define READ_STR "read"
Expand Down Expand Up @@ -151,7 +155,7 @@ int nfsd3_write_start(struct pt_regs *ctx, struct svc_rqst *rqstp, void *fhp,
}

int nfsd4_read_start(struct pt_regs *ctx, struct svc_rqst *rqstp, void *cstate,
nfsd4_read *nfs_read)
struct nfsd4_read *nfs_read)
{
u32 pid = bpf_get_current_pid_tgid();
nfs_data_t data = {};
Expand All @@ -166,7 +170,7 @@ int nfsd4_read_start(struct pt_regs *ctx, struct svc_rqst *rqstp, void *cstate,
}

int nfsd4_write_start(struct pt_regs *ctx, struct svc_rqst *rqstp,
void *cstate, nfsd4_write *nfs_write)
void *cstate, struct nfsd4_write *nfs_write)
{
u32 pid = bpf_get_current_pid_tgid();
nfs_data_t data = {};
Expand Down Expand Up @@ -286,7 +290,7 @@ int nfsd4_write_done(struct pt_regs *ctx)
u64 ts = bpf_ktime_get_ns();
u32 pid = bpf_get_current_pid_tgid();
nfs_data_t *data = nfs_base_data.lookup(&pid);
nfsd4_write nfs_write;
struct nfsd4_write nfs_write;

if (data == 0) {
return 0; // missed issue
Expand Down
Loading