Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Message-ID: <d94da8f2-79a8-3797-4425-98015b2a0993@meta.com>
Date:   Fri, 5 May 2023 09:34:21 -0700
User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0)
 Gecko/20100101 Thunderbird/102.10.1
Subject: Re: [PATCH] bpf: Fix mask generation for 32-bit narrow loads of
 64-bit fields
Content-Language: en-US
To:     Alexei Starovoitov <alexei.starovoitov@gmail.com>
Cc:     Will Deacon <will@kernel.org>, bpf <bpf@vger.kernel.org>,
        LKML <linux-kernel@vger.kernel.org>,
        Network Development <netdev@vger.kernel.org>,
        Alexei Starovoitov <ast@kernel.org>,
        Daniel Borkmann <daniel@iogearbox.net>,
        John Fastabend <john.fastabend@gmail.com>,
        Krzesimir Nowak <krzesimir@kinvolk.io>,
        Yonghong Song <yhs@fb.com>, Andrey Ignatov <rdna@fb.com>
References: <20230502165754.16728-1-will@kernel.org>
 <2cb24299-5322-6482-024a-427024f03b7d@meta.com>
 <CAADnVQ+m_jJHTpYDvOuD1LOvgKgGPD5VHfUobMa3NF+uyu7Sbg@mail.gmail.com>
From:   Yonghong Song <yhs@meta.com>
In-Reply-To: <CAADnVQ+m_jJHTpYDvOuD1LOvgKgGPD5VHfUobMa3NF+uyu7Sbg@mail.gmail.com>
Content-Type: text/plain; charset=UTF-8; format=flowed
Content-Transfer-Encoding: 8bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?bVRuU3pXRWhpS0lOMmxsdEhBaXNRR1kxd2tqNmJaK3lIMitNdDZ0amZWazhK?=
 =?utf-8?B?dEc0MGsyOGc2dUdDSk01cDAxRjRIWVpUdzJuaHZmR2U1YnE2SE8vSGdsZEJ5?=
 =?utf-8?B?cnZGZWd2bkk4Ni9BMGR0clZ1L01KSFlsbldyaGpia0VpVzRxV245ZTAzR25H?=
 =?utf-8?B?MndMem91TU1DZWQ4ejNsUXZnM1YzaXk1eXBUYkFTeEg5cFlMeVdGb01YRXUy?=
 =?utf-8?B?S05RY29vNmxJZGhobFAzTldNOXdaMTNOVGRsU1d5cjdrbmcwT0c1YWF0ZkhM?=
 =?utf-8?B?L2ZKNmg2THpGdzBXbHJINkhnRHRHS2NnMVREODY1ZFYxaC83b2tJNkRrMzJC?=
 =?utf-8?B?WTVNU1BNcXNhREtXVVpIcng0VWRMZkFFS1Y1ejhaTU5aNlovRjVjWXpHMkRm?=
 =?utf-8?B?WTZpUHZmYzh6S2VWSi90ZWpnY2xUWE1MR3JZRU4yNm10d1VvVGg2alRTRGs1?=
 =?utf-8?B?dmhGSVJMMHhHcHlwWVlIaDV3WlJEY0xkemMybXBLcFZVY3NmUXZlM2NEVm1G?=
 =?utf-8?B?Nlg2RzNRbmhML1N5RldvbCs5V0ZjRVI3enBlR3p1YVJIeFZlOFNpVnBsQ24y?=
 =?utf-8?B?anp1anRJcDY4WmR3eDRxV2ZFLzVqczZ2Y0xTMndHeVVXZ2l0ZGdtMnBYVmRM?=
 =?utf-8?B?VjZWVE5vRi9NRENzNlRNbEFQMzlhemVaWitJZWpGMHRXZmtzR3pwZ1JWQ0Ux?=
 =?utf-8?B?aDRpY0pUOGdpMFdnRk5XWmQwNllxUTdUeFJ1TDVjRnYycmVoOVVGYUlWMVls?=
 =?utf-8?B?dm42WlFOaGJQdUwway8vanhCQjlhZ1JZY1RacWpHNVBlVS8rWlFXeE4ydWE3?=
 =?utf-8?B?Q0ltMUxKNDUxakYwaC9NZitrV2RPc2loQ3dmMGZBOXNTSk1GM3NEOVZ0SmVN?=
 =?utf-8?B?cmJwYkF0bWpwUk5FeFhIVTdRRmhGd2Z0T2N1NFllUjVTYzRDaTUyQU5RUzha?=
 =?utf-8?B?VmxjdGZsQ2hXMERGN1NTWXM4UUFSbVVQS29RTGc0anhaRVRXZCtOMGsvT2FP?=
 =?utf-8?B?QnpuTTFwaEFaNDAycnh3dlArNVRMMGNUcTA3SDRxUGNQOTVaZDVMRFNHc0My?=
 =?utf-8?B?NVZlUVFFcFpsdTA3RFM0MTFqWngxaG1MV0wzcElsWHU4ank4Sjd3T1VPZW1p?=
 =?utf-8?B?Uzd1TnAxMDMrUWVLWWs2bjJ0d0t0NjJwZFIzRllkOXh1TVd4ZDBmVEw3L2xW?=
 =?utf-8?B?djAzNmtKZ3ZlbkhGVm5NeFJSNjBSZGZzaVlQK3ZuNEs2UmRKOUdaOUpCbW50?=
 =?utf-8?B?NFlhSFZwYnU4VEpXSXNOK1VxT0RQVmhOVHdsZlhTVTBlUEtyaE95U1RoTUwz?=
 =?utf-8?B?bjRXTWE0RFpMWmgyeWxHeFdRdGJzZXphbzluenRUdC9IMDBUZktlTURUWjIv?=
 =?utf-8?B?cG1aL2NSYUREa2FxQ2NxVHB0bU9KekJlRXVpRjU4RU1DbmFDT2RGOHBQM3Rk?=
 =?utf-8?B?MmUra0t0ZXNUUDFFN2pFaVAzOGJCaUpkaXJFUzF0M1RtL0xmTDdsa3ZEL25B?=
 =?utf-8?B?ZlhJNjlFcGFUZitudGxhSE1acXhTaG1uOGZoOE9lVkM0NUV3OXVKUWowR1Mx?=
 =?utf-8?B?R08yRktWM0JLRjVvUlJVZDB3TjFES1FCNnFZSVhxcjdmR3JBNUpBLzBJZFdx?=
 =?utf-8?B?T1dqMGVacEYyWlh4RlhDTk1HR21PUzBFUDZxcjVLelZmdVRkVWVPeWcrdVNZ?=
 =?utf-8?B?T3hiWW92MFpnZk9ua3J6K3g4ZTZPN1R1TFp6Z2RPSkUrUEZqNDJSTmQ3RXh6?=
 =?utf-8?B?eVpnYkkrWUx5VFVpYzdUekdHTVRETDJLTnR2QVU0QnhzWHRzUkxjSlpYcVpk?=
 =?utf-8?B?SnVUei9WdGxuM0k3VW1DQnpNME1YRi9wTDJXTlp6Vm9sVXdZTk1LczR4RENx?=
 =?utf-8?B?Z09qZGhxb0szYXFJMnBRc0xqb0h2cEh2RVlRTGNCZGN2cWxWN3hFUWNmOE9B?=
 =?utf-8?B?STkzbSt3WTFiYWJOOHJCSHJEMWZ6OWFUM1VNblpsbGNIeGpCa0J2aHZzeTNp?=
 =?utf-8?B?QXBxeG1QMFl4L3pCVnVwNFRTSnAzU2tQejdpbGVjRFRGQ3J0aE1hM2NobTVl?=
 =?utf-8?B?aGVnRHhNb1Vocy90bXg4UjJIWWlkTGtZQ1pmNmRRSFNUczVFdkVsVm9UbFZL?=
 =?utf-8?B?cnVQN2pzMGFQcXE3anR3M1FOaVZTcHBjQk1Za1BxejJEWFRVbnRDS1pHTisx?=
 =?utf-8?B?TFE9PQ==?=
X-OriginatorOrg: meta.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 153537f4-4b02-4957-b5ff-08db4d8695c4
X-MS-Exchange-CrossTenant-AuthSource: SN6PR1501MB2064.namprd15.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2023 16:34:23.8149
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: qYJgifEEd2fHzvhT2TWffJb6XKif8dVTI3AB6Or5pvdQh7ZGIl5CHTyPG619vUK0
X-MS-Exchange-Transport-CrossTenantHeadersStamped: SA3PR15MB5702
X-Proofpoint-ORIG-GUID: tQF4Hvehk78NiRdgylcUfa1woX16TVhR
X-Proofpoint-GUID: tQF4Hvehk78NiRdgylcUfa1woX16TVhR
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
 definitions=2023-05-05_23,2023-05-05_01,2023-02-09_01
X-Spam-Status: No, score=-7.1 required=5.0 tests=BAYES_00,DKIM_SIGNED,
        DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,NICE_REPLY_A,RCVD_IN_DNSWL_LOW,
        RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_PASS,
        T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on
        lindbergh.monkeyblade.net
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org


On 5/5/23 8:30 AM, Alexei Starovoitov wrote:
> On Thu, May 4, 2023 at 1:18 PM Yonghong Song <yhs@meta.com> wrote:
>>
>>
>>
>> On 5/2/23 9:57 AM, Will Deacon wrote:
>>> A narrow load from a 64-bit context field results in a 64-bit load
>>> followed potentially by a 64-bit right-shift and then a bitwise AND
>>> operation to extract the relevant data.
>>>
>>> In the case of a 32-bit access, an immediate mask of 0xffffffff is used
>>> to construct a 64-bit BPP_AND operation which then sign-extends the mask
>>> value and effectively acts as a glorified no-op.
>>>
>>> Fix the mask generation so that narrow loads always perform a 32-bit AND
>>> operation.
>>>
>>> Cc: Alexei Starovoitov <ast@kernel.org>
>>> Cc: Daniel Borkmann <daniel@iogearbox.net>
>>> Cc: John Fastabend <john.fastabend@gmail.com>
>>> Cc: Krzesimir Nowak <krzesimir@kinvolk.io>
>>> Cc: Yonghong Song <yhs@fb.com>
>>> Cc: Andrey Ignatov <rdna@fb.com>
>>> Fixes: 31fd85816dbe ("bpf: permits narrower load from bpf program context fields")
>>> Signed-off-by: Will Deacon <will@kernel.org>
>>
>>
>> Thanks for the fix! You didn't miss anything. It is a bug and we did not
>> find it probably because user always use 'u64 val = ctx->u64_field' in
>> their bpf code...
>>
>> But I think the commit message can be improved. An example to show the
>> difference without and with this patch can explain the issue much better.
>>
>> Acked-by: Yonghong Song <yhs@fb.com>
> 
> If I'm reading it correctly it's indeed a bug.
> alu64(and, 0xffffFFFF) is a nop
> but it should have been
> alu32(and, 0xffffFFFF) which will clear upper 32-bit, right?

Right. This is my understanding as well.

> Would be good to have a selftest for this.