From 60405bb8b32b7c0af93c5209ce736442f8da7070 Mon Sep 17 00:00:00 2001 From: Timo Beckers Date: Mon, 16 Dec 2024 13:26:02 +0100 Subject: [PATCH] examples: annotate ringbuf and perf event arrays with value type information This obviates the need for declaring these unused variables, which would otherwise get included in bpf2go-generated Go code in a follow-up commit. Signed-off-by: Timo Beckers --- examples/fentry/bpf_bpfeb.o | Bin 3496 -> 3360 bytes examples/fentry/bpf_bpfel.o | Bin 3504 -> 3368 bytes examples/fentry/fentry.c | 2 +- examples/ringbuffer/bpf_bpfeb.o | Bin 2920 -> 2760 bytes examples/ringbuffer/bpf_bpfel.o | Bin 2920 -> 2760 bytes examples/ringbuffer/ringbuffer.c | 4 +--- examples/tcprtt/bpf_bpfeb.o | Bin 4208 -> 4056 bytes examples/tcprtt/bpf_bpfel.o | Bin 4216 -> 4064 bytes examples/tcprtt/tcprtt.c | 2 +- examples/tcprtt_sockops/bpf_bpfeb.o | Bin 9064 -> 8904 bytes examples/tcprtt_sockops/bpf_bpfel.o | Bin 9160 -> 9000 bytes examples/tcprtt_sockops/tcprtt_sockops.c | 2 +- examples/uretprobe/bpf_x86_bpfel.o | Bin 3200 -> 3056 bytes examples/uretprobe/uretprobe.c | 4 +--- 14 files changed, 5 insertions(+), 9 deletions(-) diff --git a/examples/fentry/bpf_bpfeb.o b/examples/fentry/bpf_bpfeb.o index bc7f806c03c333ae65a1baadc4227d639f536907..0f327df52312ec7293a5abd01717379bf45ec21d 100644 GIT binary patch delta 1148 zcmYjQJ!n%=6h7yr=}TS`n`%veo?^sCij-PKq=T6FgLDun;?O~`#RL!O{cgNqaqg+d1hD-Po9AXIR7>FW2roI(zK@1F1c-h1x58{zsub0nMmEtHad zGcPXwbK8ExjcQkNRKz2Gx^b;9dr^oau=IC`#IYU$jsajf5r1VGXB6!fb~s|c6K91~fNEche=^p6VOw4?*zla|DNve`ZJaYJ*acSBz^ z{UG$mmcx2^fQ8XZ`hZoy-140LdEyfA3h;py;0-%N4gpcHO(_Td*0R~J1aLGoG2|0) z7}&z-XzPXfgT*V>Xph{9Nxu|Zr$!C$vo#%n6S3YG%-M3K#}aS??^~NabkAbP-ERDT zZsAd*BD2#=cPeuW4{DWpc{p8PtZZ(@PI_G``> zwzP4j`~v=pp5u79ZE)=o9peZXv(G!BGoSpj=yl%9xbdf=6ZB6Qe0fDauOM3Is8-uJ{Y~SyMHhHa8xlr4_MGSw8n#;j ztrNR5LEe4$d$s2N_*X9Rbl32UaT4vqlTzsK0PL>3A>*_`ywYYfaYNm1@~HEJGM-^a zoCAru_kJ!&&M*ejaLwRjfw`0{z~{IBuOw)M&_3?!siK~B?@}kU&t+3#ybP;G<#dcu z*z17%5rjJBhErj;*(47Ki~4RYeOhn1ujyi85*(uY4fzZy?G4A=a3<8MYov1Sb&!cO Q$BWweYf&%;?3$Ur|7Hk%Y5)KL delta 1333 zcmZ8h&r4KM6h8Nk zQ6LXGmTqLU;LyD3iDjz?;KdaJtFOCrXrkvFL~H^{ysrm%3bq{z(f6=)KsSJAU^}5T z;D@lRcMG`a@E&kE2?99`TuDmRk|Q8b+{Qd9}Rg2fMvZC$)JMTj{DSR|0=thUS7mhL&baffN@X_{)KB?lccnCvlgn zPB17tbNW~rOAMb3drAz8fO2Q6Y^$Y&Vl@!sBzACtie@ARDtn=<2g|?$ARw( zW`PZg4)%M-B}|H%XTm~+GhTB1nWzQE*CL$p4aavx6)|7gjBv(lj{g+3%K6m=6GZ{K zSJXNkdyNDsn_A+cs+g~dYm0p44SbI5Kvej`DfkmnCosE2VKM2})2 z4*B$MA$d#bxxl>k`kEV4Gao%aK8>W9=~o>oZyS)ZZpKm{Of{Xz*&(o$@Y4;iXW2KQ z%Iu{(%t*_L_=SD;w8iUZJSyQn`p!X<+&8GsxSVL1t|%{oD;9V=Opjl3+d|_WX(@l2 z{9~Zx?Yh4t7aZiZd{xq9(x+9?k=s7=kG-(TMdes|gGlg$FRA5Q$S_Q(LqL!yFb1Toe}p{^K+G^y$#==LVb2qPGg9l)TmX=*R{)4P1U2isq|leYcC*V(IeJO^Be1L5 zkHX&T`bz3ebbT5?`7!tp0i|P)VDV|>$rn6@69P7X=Ky4A6sngD*GNFU;J+#ze+MrP zd;pN)Bw^oh&Pbn?dC9@j;CtyBby84L=My-rjEZ8SAkx&=zIdA316ke+E+<-d8#P+2 zu3f7wwQeuensldHU#)F_9yn@5PApa%O{yxa=2x4(skkMKhW|03R$XDr^22JX=w6P3!&!2}BX7=!6|f zxS?pik4M29n*WjYc|~h|JPN*{`6NaYt1JI$NkhV;;7|1W9JtX^v_-fANni=wSM)_E z?DDJ7DYd}ALnTYTO5_3;%;b?CLkIqiO<|{q+@8SOZktyX?^%aA60Y+1P(YP=C7iUH z`cG=N(W0e)?dt1%w2Gu&_kJnh6RPkMl)__C8x z6)xDxxTot*_$%EXFT~HB<7$p~oKmjRJ6G?ObEPpIKIo^&1veRN$P&6AGh6q;H}CuAz1cVOW|E!ZZgO)xF&UtJ z%UUc;;ipr7WL6k@P9tLcl6g^^0&z!>G6V=Kl_&-80kXgZ01Nvt*l|#eE1Z^lS~4*U zrURD%WEesCtW3L-?GTt7V1E&XVBs(Z=Xave*APQJ_d)PHcmkg7Cinn+2Ur9@0KW;` z0q6a00TsnRfH%Nl{(cNCjd&yEk7Ky6$&5DKj)C%i_`Hu)?jZP+9vAF5_FTod_DjWw z!Cxt!1b^M*g1>hdc;C}uUeD+I3=Q80N_;NZ1o<(3a|Bqk@uDA&`9Ar;H5zH&tCwhP zX}wUYHXG%VxjW__)8w|RHq@%N%uGQOTMKw1 zhKWU$FwY4^L8}fOgRU$6kmIX@)*U(q-BG%Wc)TL4`{xa?jzK?D@!!x|Q&5)<^>&;> zKeY`(UsQrRvE0+s@|`a(TJooFx@`C43bLZsqX&WUlV!^TQSw=w2m8jjFKno4J*ktZ z#>UUV3(Pt+&n@g;_vgj<{|n1hDtFfkOT}WtEU!?Zpe~SlS1Uj1%bo?SbIEOAzrM@A zFW82>9C#x;hHh^oB%{GWaaA4C<|#tso#WhZRpWQ09vb-vg4l<= diff --git a/examples/fentry/fentry.c b/examples/fentry/fentry.c index ba076f69d..d5e545aff 100644 --- a/examples/fentry/fentry.c +++ b/examples/fentry/fentry.c @@ -57,6 +57,7 @@ struct sock { struct { __uint(type, BPF_MAP_TYPE_RINGBUF); __uint(max_entries, 1 << 24); + __type(value, struct event); } events SEC(".maps"); /** @@ -71,7 +72,6 @@ struct event { __be32 saddr; __be32 daddr; }; -struct event *unused __attribute__((unused)); SEC("fentry/tcp_connect") int BPF_PROG(tcp_connect, struct sock *sk) { diff --git a/examples/ringbuffer/bpf_bpfeb.o b/examples/ringbuffer/bpf_bpfeb.o index edbd65f279d0b6102d838b8fe0e043f13f82b461..0cd270e7b64f5414d4170e0433da437e09c38948 100644 GIT binary patch delta 958 zcmYjPO=uHQ5T2K0vzzTttlA_s1zSqNpK3%e3Sv@4)LTFb#VR$_6$?p;CYFjyJb36u zh|X2ei{L>-5X6fJBGgMk4@!?cddQ((J^6jlw~%l7cITU!oj32z`iEi&*~Df~j{BHbnw_#!@1bd%^u+1|+7yEI0ukU?LELGtM4>ecaG1 zf)X~b>|#UEXPrF^`-02khwhFf@pc%*mj!lF!(gZY&VlYfxdPh*E8tDg2OoiTRtNa6 z&2<~w1Kna$40Oae!}mpY<3Sf#nNIB7eAFFN)X$0F6f-}$vUx<2VK#6OwmkF*NT5Zt z+2=24Avvk9Qm1q6d(B81wY9})rF~~PYRPJ?em8o5DS6dok2Y$}meiM*qLo%8qJL8d zJ5Nw8u09Hzo1rhB#0%JOMXsYW8>9Xu(qxkr5Zde$X{TXdboz+M4c4hTeNN;tJD+!Y zL1dj1z9n+V7NCQtv*r?1q)Xj(`h&=GqksHy?RojJRe0kOG9$)$9Zw&g<@7FNHBPJ_ z+yKGGIB~aWv*k2>fZ5S^=?#70&+1oy$-4$uQh#{4(C3{a9%?mMFemg)P&Os)1;y!; z{{yx(FI3!|yM)$1r!$!{rd-cVnSy=~ir#Hx8e7`9#N?)SgQ97$=m-y!m;hPS*ZHty uwsbu#PvhV$UgFJIJgoi&C$$$AO`yjzd0h+!Jq%nDb~*1gOropRfxZkLO~G0KM-)E;6kvV-~X}LGlm|=tTQ)+K?jTPy!#ofdp~A0K_1Z(y+4WW6+|I z6Y(Bn2aenF%<`6Z!iy4wlkb>3dJN_nf*mBou?wLGrl&p7AH%m>q@2Gyj89E>o-D|Sn{Fc`NjI8Uzww^vhUN_!feB* zTJ>6`?pNe%_~7zcR5NoBHX1yR`gFyL%a9t;ye?O}ReP1Fr2`a={f+2u1o~-X|G*XH zp6l6+{42WnlCiPa_6YQOytgJ~b?8I44Bj>%tw0NNR?VMbVe6-5G>~~H@dK;DN z&fHTD+f`6QonM)lGo!bFNAlB|;iEF`PVo_0alKI;Ord49k$(FFZ%P;C6Zi#*M@Kk? zCOz8&)0HhZBmbNzyMgZ>e2i*vxmM_}Ot>B|X^o+Wh$to?TEmr%=s0gnH##-Cp#k6p lL}U7QQViBVAk#6AOQ@Gc^0<8yaZBg2w*oHFD|s8s{RdPrdp7_8 diff --git a/examples/ringbuffer/bpf_bpfel.o b/examples/ringbuffer/bpf_bpfel.o index 6dc3a8500c5b6ca8ad9d04742be36a98d82b302c..4848d3ba658b72b4a4dc7266d7b0b60dce81e7d7 100644 GIT binary patch delta 949 zcmZuvO=uHQ5T2LKZrR3=zyde{0y+w_+Y3p@ z;P?5l3d0w`qOWxV{zwof;g9>V!r~-r0vE&>V&b4QNQnTD3}@jhpiB^)0Zp(3UIyi) z>tG!Ok}|h97GY=zrp0en#<`AY5R~&`L|l&fihro>{5qr$%0}P#6O$Q#1bu+UCugU$ z7(n*Z?aOD`F?RCf@S&0RwWdpr>gt@k*uGM8TeMQGUv*!UjdN;XPovswQN4E2U2M5T z{5!mB?Jhd`3lceqW#^LXUHe1C&%wmJUlaWmOg8<~i{6F?R-0%RvFK^&)Fq;mfj$bI zzD;yG&}X5?Hi#C8ro0J~2qCc=3}De6B79!`CA50Lzapdj-5gdctgMVW#yM*|CpRHD z1*W|>@gya9*~$!VVxmCaQ}|QyGpoxtA~XCxGH;$o%HYrDkR1#D)tg+_b80_7)y2uZ zsLC~zzf&;>!<{9g90s z>tWhN-cxyU8ripOsi-9O<}`hcqG>#<^;w zQ~RK7Fbkq0x&`wUerR+r#GnG8%vb%zjsxA=CjqY!*$QzBNjXyz`Yv?4PTq%>GxmW? z(10a1%UY+PANg9zo_$2!^js&?2)xj`6M9AQPt|p@15#?`|G)9mj%bmq81QR@q%Ii% z3tVf7ixw{$UKpXXj_iR4vvg%eC3dm9o2X(LAjqWD!H|E0 zd_G)!paQ`P@@AviZlBU!@9?+qq}t1et=!H%NXpga!B*70UHmJQc#L0KX*I#`t(@v( z+wN6yu2{YO-N?y>xS}$Sp3Q! zRloVGojdSa=O4G^<%^Sp2sUnX2--aMXByKDa1#YCMuvlz;0?K#5ArnwPx)D-_b(r~ Bb#(v$ diff --git a/examples/ringbuffer/ringbuffer.c b/examples/ringbuffer/ringbuffer.c index b931c2cd3..aeb1af008 100644 --- a/examples/ringbuffer/ringbuffer.c +++ b/examples/ringbuffer/ringbuffer.c @@ -16,11 +16,9 @@ struct event { struct { __uint(type, BPF_MAP_TYPE_RINGBUF); __uint(max_entries, 1 << 24); + __type(value, struct event); } events SEC(".maps"); -// Force emitting struct event into the ELF. -const struct event *unused __attribute__((unused)); - SEC("kprobe/sys_execve") int kprobe_execve(struct pt_regs *ctx) { u64 id = bpf_get_current_pid_tgid(); diff --git a/examples/tcprtt/bpf_bpfeb.o b/examples/tcprtt/bpf_bpfeb.o index d3ab6721febf5e385ca26f3e0914ea113f8c1b54..b879f43df757648c4526580a8d57fb26fceb9376 100644 GIT binary patch literal 4056 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 KU`F-U<^KQ){Ggry delta 1599 zcmY*ZU5JcP7(Qoyc4x-Sw==W5zFmu%)rR$#pU4eHQNjg^!N!hhza1^n+6(1| zR<8>b?Mm6?g5>AIjZh>dq?C(Q66Hd1AyJ;^d}r2p>OJrCyyrdVyyu+nI}@3o*^#-e zKjUf=Im2?wxwWcU%T67S{thTb86;GU8LPz<5!YcsyCQWH8;chB9PBQv4OV~=m@^#lsY=S$ zVDr#JsFaO7w>%5~&W}aX@Dr9d!+-L*4#8)AZf2z>T773)o(JRKVN-4V54;QGIfb>_ z$Z&*#IBFwjxoMwkOkfgUgCJxkdk;R1nZQRTU<`}gBwvCZLmgmTG6CCy(*d06X#5F{ z4rJhVp%2$$4z&QDHC;;WwVdT01m{ZZ>$f}yK4^IX{5UvZb}$_Dx8v~6x!@Ue!kdff zWE#NJm%8}mZ6JQ3ERv$K=TTzx1+ypP^-mOpM-8W zrqxQT&q60gv??eyWCpxp!a1$>+k|h>U01cL)af+zpw$a-|6Su+ov71k=u=h~(cf}I ztMhd_4Lxf0HIBcj)i~BS1u&3C;HFLZ3hmz4>b}*P!CXW13rx}X}Zy$|4 z(e8g=lli7RepIq9eo+_XL)?ve_60p5I+54wr6;jQua&Wc+daaE52)3{P2)h#iPgt< z$_I>DD4kA5CuKO13D0E~W^ayev8NbeTn|W(<4(rz$S_7!xK`_^U28EX2Dny4UO4ju zk%;_qR(HR&38QvGCNRY7BWgu1lb$9wT;ZlzfFu)1yM^lBPtfO$wsHmgf0YBDDHI)My2t)Ifx!1RF!# zNiUtkXHk+VbL=lYILclH}xQHK%1S+IbBnt)q|Cw`N1`nJ&=XcJT zxpQXDyUF_TWLcPb7ir8J|Vp$+aEBF&=!>S zitJ#(j2D&litJFpjF*&`{1w@efSYmucFH?M#a1*yo6gR8PMgjy2AsouEX*d${ECki zuE4H&&ORnK&-nWPSWnayT+Sn5%O^Mob{t_Nu4}d8s5W56^~kMO9AOQYPi8z;#>V(F zi+TcPyx%ikgWn${DtJeBOl*v|M*zPervhfYqWrIzYmCnX z%=oP5Trc`>g$WnDLsX(UO?XwzANcr3mz3W@f9?V=DSsm7HjX@6RsLRV1?;|z{EFTM zt%c%aWIn}68H9rE9s=thQb+n7A5nf5BL&sD3GX>_Uopp5J@X^uSm&F(vd-r>B%IH0 zMs+^l&!32MxE+D}lyyN{P}T+6@!^8(@alpv*?{Ei5sVPKi3cmz_1IsIvECutY$)f@ z3fVx8wL)G8Iaf*^$;8QMb4&Rnc-%S|xqK=YVW{8oTvC~ak>>ZMPK=*z`+12~d3W2- z-&a+>goSl@Y`)Gka>WOT?m|-k`E7qxN}U+Lf$D}_d1>hFz<(iiVtkHmSLLUj6|G}9 zjK8$GYQP&YhTVamOkro7fIsVK`_YiBw>;l*4G#R@;r{=?;LZbo0;;^ZFrL4Zt9yN7 z;^pDV;WHD-k@n3RkzwZIVw&sQ^uFYWq!^zvUCDerVA_+LacehkkWz%=?@qOp^p4m8 zPbK$t448w-Xh)anPgdgA?3?f!w{&J4CZv8NnT=b`8(ehfmiO_$Ik#v{GSt~?UP@*< r2fBNFEH|sMI?WAVcr3ZuxwpP;QA7AY7w;ScS@+InUBgt8Vpsk@oGUf1 delta 2970 zcmZ9OU1(fI6vxlZ-M!hwv`K4CHrd+Tq-m{R?G{vm^kda3c?c5fgF!{Nwb6)LgGn_H zh0TLtiXQ}S!T6-2NQ72Xf)b%(kqS|Q1nfhLEkyJoJ{h4(p?&cGpE)-fJur99@0>F; z=giE#yYmk(KQg(iX;~;0eXc*V?~YtLoNKDTArhh0MY9vRd2=KuViD7fb^`5Y7ccTI z`diQ{XlK^r0ck}uR5$?Aj&>H~>(Q6den4wL%cKM)L0d@o)ZPD}{0tRtQ$hcW>Q(fT zM@HzF!e3~c(J23*Wz!*H*__VR-C2vFwPBXVMxV^BBJoL=6&QU1em5O^NCz5nly!)E zUkgdVVIf=L`xrq;gjvL=(RZUk;#oYX)Bd$c%~hKKzJ-yMSD=5ddKLPQE(4Km(0@{W zJM;^hr0#b7n3T4%Gp!cBn>}3r zM?P(iRQQ>=MIR*^{pX21?*t;m!E zroTsd+*f2O0n^{_Syaq`=crxGFkhgWZdr6t%qS`_n1~rihoIt&jqX5nTFe{t>L zn3MQcn7M#)2h6ho#dCH_EWuSCz;8 z5!s=DTX6n%%o{|-BG6q*y>xckb9U+MT);8LpYxpiNK6GsV3$1SBe6yLm;cAQqlN|7 ziU_#o1DpXFM@Ymaps!g}2$+7|a;p_bn8U@B=}(l$eZ|p^fa&k?jAiitL86K`B!~NU{KBxSgn5)?G=%Vrod`iIX%gC=Ne?bdq_@y+@qo?$ukuMQg|9~2< z&;S`iLxAOA3aWGbs3Z3kb9~%0KQeAY9dC*nujBa*3CHuBu{xgX^A&LuxQxJMWu4Gg zJZA~<#)lK~hObTtl^2klyN(`WSMXrPIv?+si${Vxsq;cPgI353L<`J*s9#^cT=HAy;1JdM~g~Wk&QvymqVnxYMF#bPwT|HePjjB|+C2*vS;` z^V6{B9j!g^-$*vWUY8Cht?3u7{ks=oVRX(1xs@1|@m1*S*ErWWn-pi_(trMOygEAS z|9jwn$KjFm(w3F{>lhN@5L+5L@ayB`a=Oy-q`5ckOZJ=H>Dx(Z8>^!9qjAlw?Cd<5 zS2bNg{NA*&bE_#M>r(zMSPSW5(poEQhT<0z`o-TLp-!=w@#FKc?m;D(H6X{R;y4o8$GE)xKl=AMaa%;A*2#A?VXS$02 E0!aulbN~PV diff --git a/examples/tcprtt_sockops/bpf_bpfel.o b/examples/tcprtt_sockops/bpf_bpfel.o index e0d311d0d3f61f2426347b5659e2e62b838c2730..cd7a1edfcc73441392c07cec950575b0af0b1e20 100644 GIT binary patch delta 2757 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 QPyw$vvq|4o(XqDdKSKF6v;Y7A diff --git a/examples/tcprtt_sockops/tcprtt_sockops.c b/examples/tcprtt_sockops/tcprtt_sockops.c index 66e0cc4fa..f1db1ed83 100644 --- a/examples/tcprtt_sockops/tcprtt_sockops.c +++ b/examples/tcprtt_sockops/tcprtt_sockops.c @@ -38,6 +38,7 @@ struct sk_info { struct { __uint(type, BPF_MAP_TYPE_RINGBUF); __uint(max_entries, 1 << 24); + __type(value, struct rtt_event); } rtt_events SEC(".maps"); struct rtt_event { @@ -47,7 +48,6 @@ struct rtt_event { u32 daddr; u32 srtt; }; -struct rtt_event *unused_event __attribute__((unused)); static inline void init_sk_key(struct bpf_sock_ops *skops, struct sk_key *sk_key) { sk_key->local_ip4 = bpf_ntohl(skops->local_ip4); diff --git a/examples/uretprobe/bpf_x86_bpfel.o b/examples/uretprobe/bpf_x86_bpfel.o index 37829f5d31fed15daca4d85cc55ac7f6521a613d..26df3449ebd8266ed1bd9a529c50f5961278b588 100644 GIT binary patch delta 1159 zcmZ8hOK4L;6rFi_>3fsBq^V8%8WodTr45z(SqO@f#Eqhx7A%4kOpu^LtASWQh$N!; zLBY?(MHiwj1l@@hp&}AN5JX%Ef-Vd0-004w=gymv;Ds~y-0w{8%u6T#E4(wFd+v*W zQqim;Qg?SRQA+u_hd-qlHsLpp5RB~OBcKoJ-RAU^N3 zNmJn~=xq^~E_4wnN4B4Y-eY(Gy*J`gLYvc4JEqzR*jzgm#q~Kd;4=W{vK$8DKn17) zkaQZ0je|M^SdIZXw0jDD3RnfOv;gK6;H=>t=nF!$b)XA_r=bhb^|Ij=@N0&5z;7Df z1;1_cF}Zs-AN;<}2Vb=L;16tmOo+!eKXyonC$<2AXSM+Rg)P8%UfBZhWt$J)HM|S{ z-f$k(2fE>`8Ttwj&+Rh&F%BELpPhPv<~EZ( z{*YE;8|X`XmpXmE*$`*ya|=tp`%(5!&exkQF?Zr<<7BHL1da7=Z2v|vH)hEK+>Cwv zepnQOAty{lZ-edqKzcUHwRQlTUozV*U}sH;VvjuxdrOb)z}_dsgf4(z3--|VTQqQv z3vu1pY5Y2;Nm8w+te2HLsN{|1`J^nHfdTynwJB0`$qNTwMuXFX#D$4ZwCsJRTmCft z@MkIGxpJPWDpaF>RCSf=>WG}7cd9I>NhZS5l=;-`KK!L{CsUv&#kE_hnkZ8@;nJ1F zTA860RiH}XlAFw`Kb!zb&`7c%FLK{p&Gaqm2(BL5qxs~7bZIeJE_F=&QBRz2*6^-FO$K^%<$fu zn5bwJ3UwhAMeIVbf(sXgX4hr15Om?fjp(9F5kVJSDC%nbzWXyXc};cUfivejfA`#b z-nlnK9TY=5qV^kdPj zcDsEmEU0S{uHvLA?bBl#w1=S1X zTD9(V?UTFhsmV@8s>Cxn9ewu-$sqJwrO+`)a*m?fxbvnAs-vcw)v|NiDK?kgiWj=2 zmhYnhF05`?sg{%Dr(}>$y*2JCc|<32cN0!feZy-kC%dNc2`9PMz@kUTvw1g{IlJWM z=98@1S<3U5U6tTAT4A#l(mUbkWrGRlOm@LtaOW@Na+w$M?tJ!w_3f^v)ukI!1Gmb`jkzN6q6qPuwf7@RHqb~?{7XwA|(+cm0HTJ=`ol_gcghf1v$ngQ0( ztMc7+I71-LJo!`b7MR4jy9w4;L1aHL?-*_NP5T=7d$7E$TQ^r;?y9QyM{hfu_O#Q3+6A8(3WG5WXE*Hy?pfBN*5+~t23+Myo%HREL; zM#bJfeJ;9YlpPP7A$9+NeekGy&9q~{_|XzY*q*BLm3{*{e`jv@=zK7K@6q|zO{i@B z?s1KDL}x!pjHUloFv;p@ks_;aM)a!@{dz>-is(BLegDX?q(W~!l$7t)QfKlDDJtqR zVAi?=m#Wp)R^39mjOV1%GuHRG<7&B%FY;2@amG6k7K)MzHdd81J1|@PUt$B<>H&|e z@|yXuA4cr#eJ@cbcPB`D(^}m1%kR@mm!SMxzMWH>W9QB4F9N9l1FXTwEBzWAG&<*( z=d}6O{uFGiAML@9u#xQCYfZ;mOzD94%KwE{b68Q~$b2WPSeM t6s>;*w!X!717Z{0p%oJt?Q3+e?;^uIMV(xNzs&xx8Y}Y{XX}p{`#%SqW~TrE diff --git a/examples/uretprobe/uretprobe.c b/examples/uretprobe/uretprobe.c index 12668a22f..b058b1120 100644 --- a/examples/uretprobe/uretprobe.c +++ b/examples/uretprobe/uretprobe.c @@ -13,11 +13,9 @@ struct event { struct { __uint(type, BPF_MAP_TYPE_PERF_EVENT_ARRAY); + __type(value, struct event); } events SEC(".maps"); -// Force emitting struct event into the ELF. -const struct event *unused __attribute__((unused)); - SEC("uretprobe/bash_readline") int uretprobe_bash_readline(struct pt_regs *ctx) { struct event event;