DPDK patches and discussions
 help / color / mirror / Atom feed
From: Kevin Traynor <ktraynor@redhat.com>
To: "Loftus, Ciara" <ciara.loftus@intel.com>,
	Junxiao Shi <git@mail1.yoursunny.com>,
	"dev@dpdk.org" <dev@dpdk.org>
Cc: "stable@dpdk.org" <stable@dpdk.org>
Subject: Re: [PATCH] net/af_xdp: fix custom program loading with multiple queues
Date: Thu, 10 Mar 2022 09:41:56 +0000	[thread overview]
Message-ID: <b8ac2d0e-0e45-f902-57ef-8655108dbf1a@redhat.com> (raw)
In-Reply-To: <PH0PR11MB479175AABC5A44CAC99874F98E0B9@PH0PR11MB4791.namprd11.prod.outlook.com>

Hi Ciara/Junxiao,,

On 10/03/2022 08:49, Loftus, Ciara wrote:
>> When the PMD is configured to load a custom XDP program, it sets
>> XSK_LIBBPF_FLAGS__INHIBIT_PROG_LOAD flag to prevent libbpf from
>> loading its default XDP program. However, when queue_count is set to
>> greater than 1, this flag is only set for the first XSK socket but not
>> for subsequent XSK sockets. This causes XSK socket creation failure.
>>
>> This commit ensures that XSK_LIBBPF_FLAGS__INHIBIT_PROG_LOAD flag is
>> set for all XSK socket creations when custom XDP program is being used.
>>
>> Fixes: 01fa83c94d7e ("net/af_xdp: workaround custom program loading")
>>
>> Signed-off-by: Junxiao Shi <git@mail1.yoursunny.com>
> 
> Thanks for the patch!
> It's probably too late to make it into 22.03 but cc-ing stable as it should be backported to 21.11.x.
> 

21.11.1 will take backports from 22.03. So it will be in a later 21.11.x 
release if it doesn't make 22.03. Please add the 'Cc: stable@dpdk.com' 
tag in the commit message.

Kevin.

> Acked-by: Ciara Loftus <ciara.loftus@intel.com>
> 
>> ---
>>   drivers/net/af_xdp/rte_eth_af_xdp.c | 23 ++++++++++++-----------
>>   1 file changed, 12 insertions(+), 11 deletions(-)
>>
>> diff --git a/drivers/net/af_xdp/rte_eth_af_xdp.c
>> b/drivers/net/af_xdp/rte_eth_af_xdp.c
>> index 65479138d3..9920f49870 100644
>> --- a/drivers/net/af_xdp/rte_eth_af_xdp.c
>> +++ b/drivers/net/af_xdp/rte_eth_af_xdp.c
>> @@ -1307,18 +1307,19 @@ xsk_configure(struct pmd_internals *internals,
>> struct pkt_rx_queue *rxq,
>>   	cfg.bind_flags |= XDP_USE_NEED_WAKEUP;
>>   #endif
>>
>> -	if (strnlen(internals->prog_path, PATH_MAX) &&
>> -				!internals->custom_prog_configured) {
>> -		ret = load_custom_xdp_prog(internals->prog_path,
>> -					   internals->if_index,
>> -					   &internals->map);
>> -		if (ret) {
>> -			AF_XDP_LOG(ERR, "Failed to load custom XDP
>> program %s\n",
>> -					internals->prog_path);
>> -			goto out_umem;
>> +	if (strnlen(internals->prog_path, PATH_MAX)) {
>> +		if (!internals->custom_prog_configured) {
>> +			ret = load_custom_xdp_prog(internals->prog_path,
>> +							internals->if_index,
>> +							&internals->map);
>> +			if (ret) {
>> +				AF_XDP_LOG(ERR, "Failed to load custom
>> XDP program %s\n",
>> +						internals->prog_path);
>> +				goto out_umem;
>> +			}
>> +			internals->custom_prog_configured = 1;
>>   		}
>> -		internals->custom_prog_configured = 1;
>> -		cfg.libbpf_flags =
>> XSK_LIBBPF_FLAGS__INHIBIT_PROG_LOAD;
>> +		cfg.libbpf_flags |=
>> XSK_LIBBPF_FLAGS__INHIBIT_PROG_LOAD;
>>   	}
>>
>>   	if (internals->shared_umem)
>> --
>> 2.17.1
> 


  reply	other threads:[~2022-03-10  9:42 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-03-09 21:18 Junxiao Shi
2022-03-10  8:49 ` Loftus, Ciara
2022-03-10  9:41   ` Kevin Traynor [this message]
2022-03-11  8:01   ` Thomas Monjalon
2022-03-11 11:12     ` Loftus, Ciara
2022-03-14  8:41       ` Thomas Monjalon

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=b8ac2d0e-0e45-f902-57ef-8655108dbf1a@redhat.com \
    --to=ktraynor@redhat.com \
    --cc=ciara.loftus@intel.com \
    --cc=dev@dpdk.org \
    --cc=git@mail1.yoursunny.com \
    --cc=stable@dpdk.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).